Merge branch 'master' into feature/aron-python-conv

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

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

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h

source/RobotAPI/libraries/armem/client/util/MemoryListener.h

...cts/client/articulated_object/ArticulatedObjectWriter.cpp

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

...RobotAPI/libraries/armem_objects/server/instance/Visu.cpp

source/RobotAPI/libraries/armem_robot/types.h

source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt

...botAPI/libraries/armem_robot_state/aron/Exteroception.xml

...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

...API/libraries/armem_robot_state/client/common/constants.h

source/RobotAPI/libraries/armem_robot_state/memory_ids.cpp