Calendar is now working….need to make it better by grouping events by date
Merge remote-tracking branch 'origin/group_dev' into group_dev