public 翻译
Merge remote-tracking branch 'origin/master'

Conflicts:
	locales/ja.js
	locales/zh.js