Logger added
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Message Dummy
NW: Notificatoins
Merge pull request #138 from svdvonde/master

Database branch wordt master branch
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

Conflicts:
	.gitignore
NW: Notifications
W: Notifications
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

Conflicts:
	.gitignore
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/hello.jsp
W: Profile Controller
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Api Calendar
API Calendar Example
Merge pull request #139 from svdvonde/master

Update database branch naar laatste versie