CourseCom Teach Pref Api
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 branch 'master' of https://github.com/CalZoneVUB/CalZone

# By Timbo925
# Via Timbo925
* 'master' of https://github.com/CalZoneVUB/CalZone:
  Teachers
  Update
  CourseCom Teach Pref Api