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

scenarios/WeissHapticSensorsUnitTest/jquery.min.js

scenarios/WeissHapticSensorsUnitTest/tactile.html

source/RobotAPI/drivers/WeissHapticSensor/CMakeLists.txt

.../RobotAPI/drivers/WeissHapticSensor/CalibrationHelper.cpp

...ce/RobotAPI/drivers/WeissHapticSensor/CalibrationHelper.h

...ce/RobotAPI/drivers/WeissHapticSensor/CalibrationInfo.cpp

source/RobotAPI/drivers/WeissHapticSensor/CalibrationInfo.h

...I/statecharts/GraspingWithTorques/GraspingWithTorques.cpp

source/RobotAPI/statecharts/MovePlatform/MovePlatform.cpp

source/RobotAPI/units/TCPControlUnit.cpp