# Conflicts:
#	source/RobotAPI/applications/GraspCandidateObserver/main.cpp
#	source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/main.cpp
#	source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.cpp
#	source/RobotAPI/interface/units/RobotUnit/NJointGripperController.ice
#	source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice
#	source/RobotAPI/libraries/ArmarXEtherCAT/AbstractSlave.h
#	source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.cpp
#	source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
#	source/RobotAPI/libraries/KITGripperEtherCAT/CMakeLists.txt
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMPositionController.cpp
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMPositionController.h
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMVelocityController.cpp
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/PWMVelocityController.cpp
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/KITGripperBasisBoard.cpp
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/KITGripperBasisBoardData.cpp
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/KITGripperBasisBoardData.h
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/KITGripperBasisBoardSlave.h
#	source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/Misc/TorqueEstimation.h
#	source/RobotAPI/libraries/KITGripperEtherCAT/test/KITGripperEtherCATTest.cpp
#	source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
#	source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointCCDMPController.cpp
#	source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.cpp
#	source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h
#	source/RobotAPI/libraries/core/CMakeLists.txt
#	source/RobotAPI/libraries/widgets/CMakeLists.txt