Individual edits added
Merge branch 'development'

Conflicts:
	app/controllers/LabworkManagementController.scala
	app/utils/SemesterDatesGenerator.scala
labworkupdatemodel added