some ros output
changed output
testing
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
Removed some debug output
test
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
commenting for debug
Mutexes cleaned
Merge branch 'master' of https://github.com/KITrokopter/Control-Application

Conflicts:
	src/controller/Controller.cpp
test
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
tracking area
Merge branch 'master' of https://github.com/KITrokopter/Control-Application
for testing
fix condition