Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

CMakeLists.txt

source/RobotAPI/CMakeLists.txt

source/RobotAPI/components/units/PlatformUnitObserver.h

source/RobotAPI/gui_plugins/CMakeLists.txt

source/RobotAPI/gui_plugins/HandUnitPlugin/CMakeLists.txt

...otAPI/gui_plugins/HandUnitPlugin/HandUnitConfigDialog.cpp

...obotAPI/gui_plugins/HandUnitPlugin/HandUnitConfigDialog.h

...botAPI/gui_plugins/HandUnitPlugin/HandUnitConfigDialog.ui

...RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp

...e/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.h

.../RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.ui

source/RobotAPI/gui_plugins/HapticUnitPlugin/CMakeLists.txt

...I/gui_plugins/HapticUnitPlugin/HapticUnitConfigDialog.cpp

...API/gui_plugins/HapticUnitPlugin/HapticUnitConfigDialog.h

...PI/gui_plugins/HapticUnitPlugin/HapticUnitConfigDialog.ui

...tAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp

...botAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h

...otAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.ui

...tAPI/gui_plugins/HapticUnitPlugin/MatrixDisplayWidget.cpp

...botAPI/gui_plugins/HapticUnitPlugin/MatrixDisplayWidget.h