benchmarker fix (due to refactoring schedulersolver)
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
Toevoegen van voorkeursdatum van vak. Zie ook issue #240