Messages
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
ApiTraject Freeze
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

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