临时保存
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/constant.js
临时保存
Merge remote-tracking branch 'origin/master'