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

Conflicts:
	src/module/editor.receiver.js