Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/TimetableController.scala