Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneVUB/master'
data -> XML serialisatie mogelijk gemaakt via XStream voor benchmarker + resultaat
debugging benchmark
debugging benchmarker continued
we keep on debugging
Merge branch 'CalZoneVUB/master'
working benchmarker config + working dataset + ignore benchmark result
comparison methods for planning variables, since some benchmark configs require the existence of such methods
Set comparison methods for planning vars in annotation.
Now all benchmark configs works!
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
"fix" voor maven downgrade van java versie
Merge branch 'CalZoneVUB/Scheduler'
start refactoring data set generation for benchmark
small correction
Fix voor JUnit dependency conflict
Merge pull request #214 from yocoppen/Scheduling

small corrections
Merge commit 'f9b140f25b8c8679e1031aeab57bf31614dd4f89' into Scheduler