Merge branch 'hotfix/umessages_missing_messages'
Falling back to zh is apparently not supported in django, change zh to zh-cn
Merge branch 'hotfix/fix_zh_locale' into develop