Courses aanpassing
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Course.java

Ready to load data into database.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment