add with teacher
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Course Add Fix
Layout
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Json Serelizable fix
ApiCalendar
Api Course Fix
Ugent Fix
Toevoegen van utility-package met DateUtility voor Date-objecten te maken.
Toevoegen van Constraint Conflict detection.
Merge commit '2752fde3d11cfa5074ff6fc32bbcd5e2301fc722'
Merge branch 'master' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
	JavaServer/calzone/src/main/java/com/vub/scheduler/ConstraintChecker.java
Refactering aan SchedulerSolver
Merge branch 'CalZoneScheduling' into Scheduling

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
	JavaServer/calzone/src/main/java/com/vub/service/TrajectService.java
	JavaServer/calzone/src/main/test/com/vub/scheduler/SchedulerBenchmarker.java