Merge branch 'CalZoneMaster'
Merge branch 'CalZoneMaster'
Merge branch 'CalZoneMaster'
Move
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Scheduler alert icons
Kalender/Scheduler alerts modal boxes
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# By Timbo925 (3) and Pieter Meiresone (1)
# Via Timbo925 (2) and Pieter Meiresone (1)
* 'master' of https://github.com/CalZoneVUB/CalZone:
  Move
  Toevoegen van utility-package met DateUtility voor Date-objecten te maken.
  Ugent Fix
  Api Course Fix
Iconen toegevoegen aan kalender-entrys mogelijk
Entry Json Custom Serialization
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