sync
Merge branch 'master' into tom
another sync
sync
Merge branch 'master' into tom
Calendar layout and functions done