benchmarker fix (due to refactoring schedulersolver)
Split kalender voor proffen in bewerkbare kalender (zoals student) en kalender voor de schedular
Professor kan lessen verslepen
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# By yocoppen (10) and others
# Via yocoppen (9) and others
* 'master' of https://github.com/CalZoneVUB/CalZone:
  Fix van enkele errors na merge.
  Refactering aan scheduler
  fix constraint issues solution: no problem facts were added to the Drools working memory
  Nieuwe testen voor rules
  start nieuwe testfile voor rules te checken
  no idea why this isn't updated...
  merge made this vanish...
  Extra test voor studentAgendaDurationViolated
  Refactering aan SchedulerSolver
  Toevoegen van Constraint Conflict detection.
  verplaatst naar testcode, want relevantere locatie
  generated second dataset
  auto merge resolving
  update
  2e dataset voor benchmarker in de maak + fix foute merge in Entry
  i need to pull
Maximum hoogte voor notification is 300 px.
Pusher toegevoegd aan de ingelogde header om live notificaties weer te kunnen geven
Bootstrap modal voor entry wijzigen
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# By Timbo925
# Via Timbo925
* 'master' of https://github.com/CalZoneVUB/CalZone:
  All Classrooms API
  Notification + Messages + Moves
  Profile Messages Model + Profiel integratie
Add room id to json entry objects
Lokaal wijzigen in kalender
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
Don't refersh events