custom gem versions
rename zh locale to new names
Merge remote-tracking branch 'origin/orama'