Architecture changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ch.droptilllate.application/src/ch/droptilllate/application/controller/InitController.java