Conflicts:
	source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.cpp
	source/RobotAPI/libraries/CMakeLists.txt
	source/RobotAPI/libraries/RTRobotUnit/BasicControllers.cpp
	source/RobotAPI/libraries/RTRobotUnit/BasicControllers.h