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

Conflicts:
	app/controllers/TimetableController.scala
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development
NEW THINGS
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/TimetableController.scala
Pina colada
Merge branch 'development'

Conflicts:
	conf/routes
reformatted code
jollyday added