datum aangepast in informationCourse.jsp
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
courseInformation aanpassingen
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'FerDev'
courseInformation & addCourse aanpassingen
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'FerDev'
Merge branch 'CalZoneVUB/master'
Merge commit 'fb2cee0ef43ecc32545ef6b88e6dc36a5aba99d4'
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

Conflicts:
	JavaServer/calzone/.settings/org.eclipse.jdt.core.prefs
AddCourse
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

Conflicts:
	JavaServer/calzone/src/main/resources/messages.properties
	JavaServer/calzone/src/main/resources/messages_nl.properties
	JavaServer/calzone/target/classes/messages.properties
	JavaServer/calzone/target/classes/messages_nl.properties
Merge branch 'FerDev'

Conflicts:
	JavaServer/calzone/src/main/resources/messages_nl.properties
Merge branch 'CalZone_Algemeen/master'
Merge branch 'CalZoneVUB/Scheduler'
startup OptaPlanner Benchmarking