some bug fixes made during the testing party
Merge branch 'master' of git@github.com:JanKoehnlein/XRobot.git