# Conflicts:
#	source/RobotAPI/components/armem/CMakeLists.txt
#	source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp
#	source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
#	source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/ndarray/Orientation.cpp
#	source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/ndarray/Pose.cpp
#	source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/ndarray/Position.cpp