简体中文语言�
Merge remote-tracking branch 'origin/master'

Conflicts:
	lang/zh_cn.json