todo vom 19_06_14
Merge branch 'master' of github.com:ROS-PSE/Documents