Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneVUB/master'
Add courses to traject + security update
TeacherUnavailability.java en TeacherLecturePreference.java toevoeging
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
NW:
Enrolled courses edit
data -> XML serialisatie mogelijk gemaakt via XStream voor benchmarker + resultaat
debugging benchmark
Traject Fully Initialised function
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
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