Merge branch 'hotfix/add-display-name-to-server-email'
wrong chinese lang code for cms, was causing 404 links (SEO)
Merge branch 'hotfix/fix-cms-lang-code' into develop