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

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/scheduler/SchedularTest.java
no message
Merge pull request #161 from nicocarraggi/nicodev

Nicodev
Merge branch 'CalZoneVUB/master'