Merge pull request #237 from MPieter/master

Scheduler: Update
Profile Messages Model + Profiel integratie
benchmarker fix (due to refactoring schedulersolver)
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/HelloController.java
Notification + Messages + Moves
All Classrooms API
Merge branch 'CalZoneMaster' into Scheduling

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/scheduler/SchedulerScoreRules.drl
	JavaServer/calzone/src/main/test/com/vub/scheduler/SchedulerBenchmarker.java
since each class has its own test
Merge pull request #239 from yocoppen/Scheduling

Sync