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

Conflicts:
	app/views/labwork_information_head.scala.html
Merge branch 'development'
glyphicon color: GREEEEN