by zhanyi
by zhanyi
by zhanyi
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	configure.js
	lang/zh-cn/zh-cn.js