no message
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
Merge pull request #168 from nicocarraggi/nicodev

Nicodev
[NIET WERKEND] maar nodig voor tim
Merge pull request #169 from svdvonde/master

[NIET WERKEND] maar nodig voor tim
NW: CourseEdit
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
IP: Edit Course Page