Merge branch 'master' into DebugDrawerTopic

etc/doxygen/pages/GuiPlugins.dox

source/RobotAPI/components/units/RobotUnit/CMakeLists.txt

...Controllers/NJointCartesianVelocityControllerWithRamp.cpp

...t/NJointControllers/NJointCartesianWaypointController.cpp

...nit/NJointControllers/NJointCartesianWaypointController.h

...botUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp

source/RobotAPI/gui-plugins/CMakeLists.txt

...PI/gui-plugins/CartesianWaypointControlGui/CMakeLists.txt

...ypointControlGui/CartesianWaypointControlGuiGuiPlugin.cpp

...WaypointControlGui/CartesianWaypointControlGuiGuiPlugin.h

...anWaypointControlGui/CartesianWaypointControlGuiWidget.ui

...ontrolGui/CartesianWaypointControlGuiWidgetController.cpp

...tControlGui/CartesianWaypointControlGuiWidgetController.h

...plugins/HapticUnitPlugin/MatrixDatafieldDisplayWidget.cpp

source/RobotAPI/interface/CMakeLists.txt

...tAPI/interface/core/CartesianWaypointControllerConfig.ice

...ace/units/RobotUnit/NJointCartesianWaypointController.ice

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h

source/RobotAPI/libraries/CMakeLists.txt