Merge branch 'master' into memorygui-reconnect

...I/components/armem/server/ExampleMemory/ExampleMemory.cpp

...API/components/armem/server/ExampleMemory/ExampleMemory.h

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

.../gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h

source/RobotAPI/interface/CMakeLists.txt

...obotAPI/interface/armem/mns/MemoryNameSystemInterface.ice

source/RobotAPI/interface/armem/prediction.ice

source/RobotAPI/interface/armem/server.ice

source/RobotAPI/interface/armem/server/MemoryInterface.ice

...otAPI/interface/armem/server/MemoryPredictorInterface.ice

...tAPI/interface/armem/server/PredictingMemoryInterface.ice

source/RobotAPI/libraries/armem/CMakeLists.txt

source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp

source/RobotAPI/libraries/armem/client/Prediction.cpp

source/RobotAPI/libraries/armem/client/Prediction.h

source/RobotAPI/libraries/armem/client/Reader.cpp

source/RobotAPI/libraries/armem/client/Reader.h

source/RobotAPI/libraries/armem/core/error/ArMemError.cpp

source/RobotAPI/libraries/armem/core/error/ArMemError.h

source/RobotAPI/libraries/armem/mns/MemoryNameSystem.cpp