Merge remote-tracking branch 'upstream/master'
Fix time display. Was using 12-hour format without am/pm indication.
Make data format compatible with ISO8601.
Merge pull request #395 from MichaelRitzert/date-format-fix

Date format fix