Merge pull request #1695 from stevewithington/develop

format dates for getCalendarEvents()