Fixed merging error
Merge branch 'master' of https://github.com/KITrokopter/Control-Application into daniela