Merge branch 'master' into feature/skillMemoryGUI

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp

...ponents/DynamicObstacleManager/DynamicObstacleManager.cpp

source/RobotAPI/components/ObjectMemoryEditor/Editor.h

...RobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp

...nts/armem/client/VirtualRobotWriterExample/CMakeLists.txt

...t/VirtualRobotWriterExample/VirtualRobotWriterExample.cpp

source/RobotAPI/components/units/CMakeLists.txt

...acleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp

...s/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.cpp

...tControllers/NJointCartesianNaturalPositionController.cpp

...llers/NJointHolonomicPlatformGlobalPositionController.cpp

...rollers/NJointHolonomicPlatformGlobalPositionController.h

...llers/NJointHolonomicPlatformRelativePositionController.h

...units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp

...mponents/units/RobotUnit/util/ControlThreadOutputBuffer.h

source/RobotAPI/components/units/SensorActorUnit.cpp

source/RobotAPI/libraries/PriorKnowledge/core/FinderBase.h

source/RobotAPI/libraries/SimpleTrajectory/CMakeLists.txt

source/RobotAPI/libraries/armem/util/util.h

source/RobotAPI/libraries/armem_robot/types.h