Chinese locale added
Merge branch 'master' into hotfix
Merge branch 'hotfix' into uidev