Merge branch 'development'

Conflicts:
	conf/routes
reformatted code
jollyday added
Added list of german bank holidays
id and name from labwork removed
assignemtsolution: rename: name -> filename
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/AssignmentManagementController.scala
	app/models/Assignments.scala
	app/views/assignment_list.scala.html
	conf/routes