fix
Scripte
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
Ros debug
Merge commit 'a71705' into testing

Conflicts:
	src/controller/Controller.cpp