Merge pull request #176 from nicocarraggi/nicodev

Werkende LoadDump.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev