Use correct datetime format
Merge branch 'issue/17-forms' into develop
Merge branch 'develop' of github.com:SamStudio8/triage into develop