Updated main calendar view to be a one-week view; grouped events in main calendar view by day
Merge remote-tracking branch 'origin/templates' into templates