# Conflicts:
#	source/RobotAPI/libraries/armem_robot_state/server/localization/Segment.cpp

Fix bugs in ArMem and make disk loading and storing nicer

See merge request ArmarX/RobotAPI!192

# Conflicts:
#	source/RobotAPI/libraries/armem/CMakeLists.txt
#	source/RobotAPI/libraries/armem/core/base/MemoryBase.h
#	source/RobotAPI/libraries/armem/core/longtermmemory/Entity.cpp
#	source/RobotAPI/libraries/armem/core/longtermmemory/Entity.h
#	source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp
#	source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
#	source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp