Delete HelloController.class
Merge commit 'e75532c640ef98a6848553c995d356a9a111df6b'

Conflicts:
	JavaServer/calzone/target/classes/com/vub/controller/HelloController.class
Remove hellocrontroller.class
Merge commit '72c1363fbdcada63adbd12f9ed726d73887e3f12' into Dev
Merge commit '72c1363fbdcada63adbd12f9ed726d73887e3f12'
Merge branch 'Dev'
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Verwijderen van pijpte in nav-bar
Redirect logout fix
Courses en Rooms
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge pull request #61 from nicocarraggi/nicodev

Rooms en Courses to Master
Mail Update
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Courses
Merge pull request #65 from nicocarraggi/nicodev

Courses
navigation bar aangepast, enrolledcourses aangepast
Merge branch 'FerDev'

Conflicts:
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/EnrolledCourses.jsp
KeyStrings