Merge remote-tracking branch 'origin/master' into feature/armem_laser_scans

data/RobotAPI/robots/MMM/mmm.xml

etc/cmake/Findsick_scan_base.cmake

etc/cmake/UseRobotAPI.cmake

etc/raw_socket/.gitignore

scenarios/ArMemObjectMemory/ArMemObjectMemory.scx

scenarios/ArMemObjectMemory/config/ObjectMemory.cfg

scenarios/ArMemObjectMemory/config/RobotStateMemory.cfg

scenarios/SkillProviderTest/SkillProviderTest.scx

scenarios/SkillProviderTest/config/SkillProviderExample.cfg

scenarios/SkillProviderTest/config/SkillsMemory.cfg

scenarios/SkillProviderTest/config/global.cfg

...ce/RobotAPI/applications/AronCodeGenerator/CMakeLists.txt

source/RobotAPI/applications/AronCodeGenerator/main.cpp

...RobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp

...cyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.h

...otAPI/components/armem/server/GraspMemory/GraspMemory.cpp

...obotAPI/components/armem/server/GraspMemory/GraspMemory.h

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

...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h

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