Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneMaster' into MyMaster
Enroll Cources
Local DB
Aanpassingen aan Scheduler
Merge commit 'b7dd41c810e7d9867d706ea30770a22afe5530c7' into Scheduler
Enrolled Courses
Not Follow
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Course Add working
Before Hibernat Lazy Fix
Hibernate test not working
Windows Fix
I am Jezus
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEndHibernate
Database fix
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