[fixed] by xuheng
[fixed] by xuheng
[fixed] by xuheng
[fixed] by xuheng
Merge remote-tracking branch 'origin/master'

Conflicts:
	_src/adapter/dialog.js
[fixed] by xuheng