Merge pull request #138 from svdvonde/master

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