Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp

...lugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp

...rPlugin/aronTreeWidget/visitors/AronTreeWidgetCreator.cpp

...erPlugin/aronTreeWidget/visitors/AronTreeWidgetSetter.cpp

...ManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp

source/RobotAPI/interface/aron/Aron.ice

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp

...ries/armem/server/ltm/detail/mixins/BufferedMemoryMixin.h

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

...e/RobotAPI/libraries/armem_objects/server/class/Segment.h

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

source/RobotAPI/libraries/armem_robot/types.h

...botAPI/libraries/armem_robot_state/aron/Exteroception.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

...tate/server/exteroception/converters/ArmarDEConverter.cpp