Controller update
Bla
Merge branch 'preFinal' of https://github.com/jumahtwg/mensch.git into
preFinal

Conflicts:
	target/classes/controller/Controller.class