test
Merge branch 'pController' of https://github.com/KITrokopter/Control-Application into pController

Conflicts:
	src/controller/Controller.cpp
	src/controller/Controller.hpp