Merge remote-tracking branch 'origin/master' into fix/cartographer

scenarios/ArMemExample/config/ExampleMemory.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

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp

...omponents/armem/server/ExampleMemory/aron/ExampleData.xml

...ents/skills/SkillProviderExample/SkillProviderExample.cpp

...onents/skills/SkillProviderExample/SkillProviderExample.h

...onents/units/RobotUnit/util/ControlThreadOutputBuffer.cpp

...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui

...killManagerPlugin/SkillManagerMonitorWidgetController.cpp

.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h

source/RobotAPI/interface/aron/Aron.ice

.../RobotAPI/libraries/armem/server/test/ArMemMemoryTest.cpp

source/RobotAPI/libraries/armem_gui/test/ArMemGuiTest.cpp

...raries/armem_objects/client/articulated_object/Writer.cpp