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
Update
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/views/assignment_list.scala.html
	app/views/labWorkInformation.scala.html
	app/views/timeTableManagement.scala.html
New hsit
Merge branch 'development'
refactorings...