might work ...
Merge branch 'master' of https://github.com/KITrokopter/Control-Application

Conflicts:
	src/controller/Controller.cpp