Mail Update
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
navigation bar aangepast, enrolledcourses aangepast
Merge branch 'FerDev'

Conflicts:
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/EnrolledCourses.jsp
KeyStrings
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge pull request #66 from nicocarraggi/nicodev

KeyStrings
algemene veranderingen jsp files
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'FerDev'
Merge pull request #69 from fsuarezg/master

Algemene jsp aanpassingen
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Insert+Delete Enrollment
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Enrollement + Passwordforgot pages + Spring Mail
Activated Account Pages
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
CSS Error bij password forgot pagina
Merge pull request #71 from nicocarraggi/nicodev

Enrollment
EnrollmentDao