Merge branch 'development'
usabilty stuff in dashboard added
Merge branch 'development'

Conflicts:
	app/models/ScheduleAssociations.scala
js changed on load behaviour
degree in student dashboard added
admin stuff
EVERYTHING IS FINE