Entries + Notification
NotificationType
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/ReadCSVController.java
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Notification in database.
Merge pull request #227 from nicocarraggi/nicodev

Nicodev