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
Toevoegen van lokaal pagina is af
Merge branch 'branch_voor_merge'
javadoc
Merge pull request #221 from svdvonde/master

Toevoegen van lokaal kan geïntegreerd worden in dashboard door tim
Issue #165 opgelost
Merge branch 'branch_voor_merge'
Merge pull request #222 from svdvonde/master

Issue #165 opgelost
Deleten van lokalen op elegante manier mogelijk gemaakt
Merge pull request #223 from svdvonde/master

Issue 87 opgelost: deleten van lokalen
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Notification in database.
Merge pull request #227 from nicocarraggi/nicodev

Nicodev
Update
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
API Calendar