Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

...API/applications/WeissHapticSensor/WeissHapticSensorApp.h

source/RobotAPI/applications/WeissHapticSensor/main.cpp

...ations/WeissHapticSensorsUnit/WeissHapticSensorsUnitApp.h

source/RobotAPI/applications/WeissHapticSensorsUnit/main.cpp

...s/WeissHapticSensorListener/WeissHapticSensorListener.cpp

...cts/WeissHapticSensorListener/WeissHapticSensorListener.h

...pticSensorListener/test/WeissHapticSensorListenerTest.cpp

source/RobotAPI/core/RobotStatechartContext.h

...tAPI/drivers/WeissHapticSensor/WeissHapticSensorsUnit.cpp

...botAPI/drivers/WeissHapticSensor/WeissHapticSensorsUnit.h

source/RobotAPI/motioncontrol/MotionControl.cpp

source/RobotAPI/motioncontrol/MotionControl.h