Merge pull request #139 from svdvonde/master

Update database branch naar laatste versie
Merge pull request #140 from CalZoneVUB/Database

Merge pull request #139 from svdvonde/master
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone