Merge remote-tracking branch 'origin/master' into armem/dev

source/RobotAPI/components/ArViz/Client/Elements.h

source/RobotAPI/components/ArViz/Coin/Visualizer.cpp

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

...PI/components/units/relays/ForceTorqueUnitListenerRelay.h

...nents/units/relays/InertialMeasurementUnitListenerRelay.h

...tAPI/components/units/relays/KinematicUnitListenerRelay.h

...obotAPI/components/units/relays/RobotStateListenerRelay.h

source/RobotAPI/components/units/relays/syntaxcheck.cpp

source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp

...obotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp

...gins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp

source/RobotAPI/libraries/ArmarXEtherCAT/SlaveIdentifier.cpp

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp

...braries/armem_objects/client/articulated_object/utils.cpp

source/RobotAPI/libraries/armem_robot/robot_conversions.cpp