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

Conflicts:
	_examples/editor_api.js