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

Conflicts:
	app/models/ScheduleAssociations.scala
js changed on load behaviour