reformatted dates in calendar
Merge branch 'chris'