CourseCom Teach Pref Api
TeacherLecturePreference ONE TO ONE
Merge pull request #242 from nicocarraggi/nicodev

TeacherLecturePreference ONE TO ONE
Update
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
Teachers
Merge commit 'dfcc8e63178a6f0818d939ccbab2d7a8ec291321'
Merge branch 'master' into Dev3

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/HelloController.java