Merge conflict resolved

interface/slice/units/HeadIKUnit.ice

...ePlatformTest/configs/MovePlatformExampleCloseToTable.xml

...mToLandmarkTest/WidgetMovePlatformToLandmarkApp.armarxgui

scenarios/MovePlatformToLandmarkTest/configs/ArmarXGui.cfg

...s/MovePlatformToLandmarkTest/configs/ConditionHandler.cfg

scenarios/MovePlatformToLandmarkTest/configs/Global.cfg

...mToLandmarkTest/configs/MovePlatformToLandmarkExample.xml

...ndmarkTest/configs/MovePlatformToLandmarkExampleGraph.xml

...formToLandmarkTest/configs/MovePlatformToLandmarkTest.cfg

...vePlatformToLandmarkTest/configs/PlatformUnitObserver.cfg

...arios/MovePlatformToLandmarkTest/configs/RobotControl.cfg

...ios/MovePlatformToLandmarkTest/configs/SystemObserver.cfg

scenarios/MovePlatformToLandmarkTest/startScenario.sh

...rmToLandmarkTest/start_the_scenario_in_SimulatorGui_first

scenarios/MovePlatformToLandmarkTest/stopScenario.sh

source/RobotAPI/applications/CMakeLists.txt

source/RobotAPI/applications/HeadIKUnit/CMakeLists.txt

source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h

source/RobotAPI/applications/HeadIKUnit/main.cpp

source/RobotAPI/applications/MovePlatform/MovePlatformApp.h