globalCalendar done
Merge branch 'tom' into dev