Merge remote-tracking branch 'origin/master' into 42-add-grasp-affordance-memory

data/RobotAPI/robotStateMemoryConfig.txt

etc/cmake/Findsick_scan_base.cmake

scenarios/ArMemObjectMemory/ArMemObjectMemory.scx

...ObjectMemory/config/ArticulatedObjectLocalizerExample.cfg

...ry/config/ArticulatedObjectLocalizerExample.instance1.cfg

scenarios/ArMemObjectMemory/config/ObjectMemory.cfg

scenarios/RobotSkillsMemory/config/SkillsMemory.cfg

scenarios/SickLaserUnit/SickLaserUnit.scx

scenarios/SickLaserUnit/config/SickLaserUnit.cfg

scenarios/SickLaserUnit/config/global.cfg

scenarios/SickLaserUnitTest/SickLaserUnitTest.scx

scenarios/SickLaserUnitTest/config/SickLaserUnit.cfg

scenarios/SickLaserUnitTest/config/global.cfg

source/RobotAPI/applications/RobotControlUI/CMakeLists.txt

source/RobotAPI/components/ArViz/Client/Elements.h

...botAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp

...RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.h

source/RobotAPI/components/ArViz/Client/elements/Mesh.h

source/RobotAPI/components/ArViz/Coin/ElementVisualizer.cpp

source/RobotAPI/components/ArViz/Coin/ElementVisualizer.h