Hallo
Merge remote-tracking branch 'origin/master' into dennis

Conflicts:
	src/Controller/MainController.java