Bugfixes na merge
Merge pull request #101 from MPieter/master

Bugfixes na merge
Persistence.xml aangepast
no message
Refactering na iteratie 2
Merge commit '574e9812167f6bf8bd02df8a0ce3b1dfb28ae9c2'
Merge pull request #102 from svdvonde/master

Persistence.xml aangepast
Refactering na iteratie 2
Merge pull request #104 from MPieter/master

Refactering na iteratie 2
Merge branch 'CalZoneMaster' into logging