Merge branch 'CalZoneMaster'
Merge branch 'CalZoneMaster'
Merge branch 'CalZoneMaster'
Merge branch 'master'
program admin dashboard
programdashboard
Merge branch 'CalZoneAlgemeen/master'
Merge branch 'master'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Program.java
	JavaServer/calzone/src/main/java/com/vub/model/SelectResponseConverter.java
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/AdminDashboard.jsp
Merge branch 'CalZoneMaster'
Program dashboard
Merge branch 'CalZoneAlgemeen/master'
Merge branch 'CalZoneMaster'
Add Classroom toegevoegd aan het dashboard
Merge pull request #232 from fsuarezg/master

Program dashboard
Notification tab toegevoegd aan dashboard
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Merge branch 'publish_notification'

Conflicts:
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/AdminDashboard.jsp
Merge pull request #233 from svdvonde/master

Publish tab toegevoegd bij dashboard
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Notification System Fix