Merge branch 'development'

Conflicts:
	app/views/labwork_information_head.scala.html
Merge branch 'development'
glyphicon color: GREEEEN
emails reactivated
email session debug
disabled debugs
order id added to assignment assocs
Marvel + Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/AssignmentManagementController.scala
	conf/routes
	public/stylesheets/bootstrap.min.css