Merge pull request #150 from nicocarraggi/nicodev

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