minor refactoring: changing date format to YYYY/MM/DD HH24:MI:SS
Merge branch 'dev'