Merge remote-tracking branch 'origin/master' into feature/open-fridge

source/RobotAPI/components/units/HandUnit.h

source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h

source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp

...tAPI/libraries/armem_laser_scans/client/common/Reader.cpp

...botAPI/libraries/armem_laser_scans/client/common/Reader.h

source/RobotAPI/libraries/armem_laser_scans/server/Visu.cpp

source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml

...RobotAPI/libraries/armem_objects/server/class/Segment.cpp

...otAPI/libraries/armem_objects/server/instance/Segment.cpp

source/RobotAPI/libraries/armem_robot/types.h

...otAPI/libraries/armem_robot_state/aron/Proprioception.xml

...RobotAPI/libraries/armem_robot_state/aron_conversions.cpp

...e/RobotAPI/libraries/armem_robot_state/aron_conversions.h

...libraries/armem_robot_state/client/common/RobotReader.cpp

...I/libraries/armem_robot_state/client/common/RobotReader.h

...es/armem_robot_state/client/common/VirtualRobotReader.cpp

...ries/armem_robot_state/client/common/VirtualRobotReader.h

...obotAPI/libraries/armem_robot_state/server/CMakeLists.txt