Merge branch 'master' into feature/forgetting-in-wem-and-em

data/RobotAPI/robots/Armar3/ArmarIII-Head.xml

data/RobotAPI/robots/Armar3/ArmarIII-LeftArm.xml

data/RobotAPI/robots/Armar3/ArmarIII-RightArm.xml

data/RobotAPI/robots/Armar3/ArmarIII.xml

scenarios/ArMemExample/config/ExampleMemory.cfg

...tedObjectWriterExample/ArticulatedObjectWriterExample.scx

...riterExample/config/ArticulatedObjectLocalizerExample.cfg

...s/ArticulatedObjectWriterExample/config/DebugObserver.cfg

...os/ArticulatedObjectWriterExample/config/ObjectMemory.cfg

...rticulatedObjectWriterExample/config/RobotStateMemory.cfg

scenarios/RobotSkillsMemory/RobotSkillsMemory.scx

scenarios/RobotSkillsMemory/config/ArVizStorage.cfg

scenarios/RobotSkillsMemory/config/DebugObserver.cfg

scenarios/RobotSkillsMemory/config/MemoryNameSystem.cfg

scenarios/RobotSkillsMemory/config/RemoteGuiProviderApp.cfg

scenarios/RobotSkillsMemory/config/SkillsMemory.cfg

scenarios/SkillProviderTest/config/SkillsMemory.cfg

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

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

...API/components/ArViz/Client/elements/MeshCGALExtensions.h