Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneMaster' into MyMaster
Merge branch 'CalZoneMaster'
i need to pull
Merge branch 'CalZoneVUB/Scheduler'
Merge branch 'CalZoneVUB/master'
2e dataset voor benchmarker in de maak + fix foute merge in Entry
Merge branch 'CalZoneMaster'
Merge branch 'CalZoneMaster'
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
Move
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Scheduler alert icons
Kalender/Scheduler alerts modal boxes