scheduler takes now immovable entries into account
small edit
reorganising + completing freezing mechanism
startup testing freezing system
continuation of creating tests for freezing mechanisms
continuation of test development for freezing mechanism
continuation freeze tests
finalisation frozen tests
i forgot a little assert to test on
new rules
syntax correction
Format layout Sidebar + push before pull
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# Via Christophe Gaethofs
* 'master' of https://github.com/CalZoneVUB/CalZone:
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# By Timbo925
# Via Timbo925
* 'master' of https://github.com/CalZoneVUB/CalZone:
  schedular Controller
  API Prefs
Nederlandse kalender op frontpage
Merge branch 'CalZoneMaster' into Scheduling

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Entry.java
	JavaServer/calzone/src/main/java/com/vub/scheduler/constraints/RuleNames.java
Merge pull request #245 from yocoppen/Scheduling

merge master + freezing + new rules in drools
Toevoegen van repeated planning en no lectures in the evening.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd