controller fix
fixed date and time format
Merge branch 'develop'