FR 1.4 & 2.1
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into Dev2