Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

data/RobotAPI/VariantInfo-RobotAPI.xml

source/RobotAPI/components/ArViz/Client/elements/Line.cpp

source/RobotAPI/components/ArViz/Client/elements/Line.h

source/RobotAPI/components/ArViz/Client/elements/Path.h

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp

...bjectLocalizerExample/ArticulatedObjectLocalizerExample.h

...nents/ObjectPoseClientExample/ObjectPoseClientExample.cpp

...otAPI/components/armem/server/GraspMemory/GraspMemory.cpp

...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp

...mponents/armem/server/RobotStateMemory/RobotStateMemory.h

source/RobotAPI/components/units/ForceTorqueUnit.h

source/RobotAPI/components/units/HapticUnit.h

source/RobotAPI/components/units/PlatformUnit.cpp

source/RobotAPI/components/units/PlatformUnitSimulation.cpp

...units/RobotUnit/NJointControllers/NJointTCPController.cpp

source/RobotAPI/interface/core/RobotLocalization.ice

source/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.cpp

source/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.h

source/RobotAPI/libraries/ArmarXObjects/Scene.h

source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp