Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api

...RobotAPI/components/RobotNameService/RobotNameService.cpp

...e/RobotAPI/components/RobotNameService/RobotNameService.h

...ce/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt

...I/gui-plugins/SkillManagerPlugin/PeriodicUpdateWidget.cpp

...API/gui-plugins/SkillManagerPlugin/PeriodicUpdateWidget.h

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

...killManagerPlugin/SkillManagerMonitorWidgetController.cpp

.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h

...nterface/robot_name_service/RobotNameServiceInterface.ice

...ies/PriorKnowledge/util/LocationLoader/LocationLoader.cpp

...s/PriorKnowledge/util/LocationLoader/datatypes/Location.h

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

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

source/RobotAPI/libraries/armem_locations/aron/Location.xml

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