Merge branch 'master' into feature/skillMemoryGUI

...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp

...RobotAPI/libraries/armem/client/util/SimpleWriterBase.cpp

...e/RobotAPI/libraries/armem/client/util/SimpleWriterBase.h

source/RobotAPI/libraries/armem_objects/CMakeLists.txt

source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml

source/RobotAPI/libraries/armem_objects/aron_conversions.cpp

source/RobotAPI/libraries/armem_objects/aron_conversions.h

...tAPI/libraries/armem_objects/client/class/ClassReader.cpp

...botAPI/libraries/armem_objects/client/class/ClassReader.h

...tAPI/libraries/armem_objects/client/class/ClassWriter.cpp

...botAPI/libraries/armem_objects/client/class/ClassWriter.h

source/RobotAPI/libraries/armem_objects/types.h

...I/libraries/armem_vision/client/occupancy_grid/Writer.cpp

...API/libraries/armem_vision/client/occupancy_grid/Writer.h

...ies/skills/provider/detail/SkillImplementationWrapper.cpp