fix time format
Merge branch 'fixTimeFormat'

Conflicts:
	package.json