Testcommit 2
locales added and zho deleted
Merge remote-tracking branch 'origin/master'