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

Conflicts:
	app/models/Semesters.scala
Merge branch 'development'

Conflicts:
	app/controllers/LabworkManagementController.scala
	app/models/Semesters.scala
labwork assignment stuff