Testing
fixing errors
Merge remote-tracking branch 'origin/master' into stabilize

Conflicts:
	src/controller/Controller.cpp