Merge pull request #213 from yocoppen/Scheduling

Benchmark completion
ConstraintChecker.java toevoeging
Merge commit '20fd21ff0ba085fd05c3ba23e1d9e423e34d100e' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Entry.java
Merge branch 'CalZoneVUB/Scheduler'