Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneMaster' into MyMaster
i need to pull
Merge branch 'CalZoneVUB/Scheduler'
Merge branch 'CalZoneVUB/master'
2e dataset voor benchmarker in de maak + fix foute merge in Entry
update
Merge branch 'CalZoneMaster' into MyMaster

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/HelloController.java
	JavaServer/calzone/src/main/java/com/vub/service/TrajectService.java
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/EnrolledCourses.jsp
Merge branch 'MyMaster' into Scheduling
auto merge resolving
generated second dataset
verplaatst naar testcode, want relevantere locatie
Merge branch 'CalZoneMaster' into Scheduling
Toevoegen van Constraint Conflict detection.
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
Scheduler alert icons
Kalender/Scheduler alerts modal boxes
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# By Timbo925 (3) and Pieter Meiresone (1)
# Via Timbo925 (2) and Pieter Meiresone (1)
* 'master' of https://github.com/CalZoneVUB/CalZone:
  Move
  Toevoegen van utility-package met DateUtility voor Date-objecten te maken.
  Ugent Fix
  Api Course Fix
Iconen toegevoegen aan kalender-entrys mogelijk
Refactering aan SchedulerSolver