Changed message and cleaned up code
Merge branch 'master' into savingdata

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