Calendar looking better
Merge remote-tracking branch 'origin/group_dev' into group_dev