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

.gitignore

source/RobotAPI/components/units/HapticObserver.cpp

source/RobotAPI/components/units/HardwareUnit.cpp

source/RobotAPI/components/units/HardwareUnit.h

source/RobotAPI/components/units/KinematicUnitSimulation.cpp

source/RobotAPI/components/units/KinematicUnitSimulation.h

source/RobotAPI/components/units/TCPControlUnit.cpp

..._plugins/GraphVisualizerPlugin/GraphVisualizerGuiPlugin.h

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

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

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

...plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp

...i_plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h

..._plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.ui

...ui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp

.../gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h

...gui_plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui

...PI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h

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

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