alert my calendar
Merge branch 'tom' into dev