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

Conflicts:
	app/controllers/LabworkManagementController.scala
Added (partially) a statement system
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/LabworkManagementController.scala
Merge branch 'development'

Conflicts:
	app/views/labwork_information_head.scala.html