Added time & date format options to calendar
Merge branch 'develop'