fix am pm for non-english languages
Merge branch 'fix-am-pm' into dev
Merge branch 'dev'