Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

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

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

source/RobotAPI/drivers/SickLaserUnit/CMakeLists.txt

source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp

source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h

source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp

source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.h

source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp

source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h

source/RobotAPI/interface/armem/query.ice

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice

.../DMPController/NJointPeriodicTSDMPCompliantController.cpp

...rs/DMPController/NJointPeriodicTSDMPCompliantController.h

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h

...e/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp

source/RobotAPI/libraries/armem/core/longtermmemory/Memory.h

...ce/RobotAPI/libraries/armem/core/workingmemory/Memory.cpp

source/RobotAPI/libraries/armem/core/workingmemory/Memory.h

...ce/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp