cleaned useless code up
Merge branch 'daniela' of https://github.com/KITrokopter/Control-Application into daniela