cleaned up merge conflict

etc/doxygen/pages/armarpose.dox

scenarios/deprecated/MotionControlTest/CMakeLists.txt

scenarios/tests/CMakeLists.txt

scenarios/tests/InertialMeasurementUnit/CMakeLists.txt

source/RobotAPI/applications/CMakeLists.txt

...plications/InertialMeasurementUnitObserver/CMakeLists.txt

...surementUnitObserver/InertialMeasurementUnitObserverApp.h

...API/applications/InertialMeasurementUnitObserver/main.cpp

source/RobotAPI/applications/XsensIMU/CMakeLists.txt

source/RobotAPI/applications/XsensIMU/XsensIMUApp.h

source/RobotAPI/applications/XsensIMU/main.cpp

source/RobotAPI/components/units/CMakeLists.txt

source/RobotAPI/components/units/ForceTorqueObserver.cpp

source/RobotAPI/components/units/ForceTorqueObserver.h

source/RobotAPI/components/units/ForceTorqueUnit.h

...e/RobotAPI/components/units/ForceTorqueUnitSimulation.cpp

source/RobotAPI/components/units/HeadIKUnit.cpp

source/RobotAPI/components/units/InertialMeasurementUnit.cpp

source/RobotAPI/components/units/InertialMeasurementUnit.h

...tAPI/components/units/InertialMeasurementUnitObserver.cpp