Usertypes
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge pull request #34 from nicocarraggi/nicodev

New UserTypes
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment