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

data/RobotAPI/VariantInfo-RobotAPI.xml

...obotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.h

...e/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h

...botAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h

...plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp

...i-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h

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

...gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.h

...PI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h

...gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.cpp

...I/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.h

...tAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h

...ns/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h

...orActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.ui

...lugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.h

...rActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.h

...ugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.h

...ce/RobotAPI/interface/hardware/BusInspectionInterface.ice