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
Scheduler ondersteunt nu TeacherLecturePreference. Zie ook issue #241
Scheduler ondersteunt nu TeacherUnavailabilities (met Unit tests).
Toevoegen van Transient aan CourseComponent.java (in afwachting van fix.)
TeacherLecturePreference ONE TO ONE
Merge pull request #242 from nicocarraggi/nicodev

TeacherLecturePreference ONE TO ONE
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# By MPieter (4) and others
# Via MPieter (1) and others
* 'master' of https://github.com/CalZoneVUB/CalZone:
  TeacherLecturePreference ONE TO ONE
  Toevoegen van Transient aan CourseComponent.java (in afwachting van fix.)
  Scheduler ondersteunt nu TeacherUnavailabilities (met Unit tests).
  Scheduler ondersteunt nu TeacherLecturePreference. Zie ook issue #241
  Toevoegen van voorkeursdatum van vak. Zie ook issue #240
  since each class has its own test
  benchmarker fix (due to refactoring schedulersolver)