by zhanyi
Merge branch 'dev-1.2.6-doc' of https://github.com/campaign/ueditor into dev-1.2.6-doc
Merge branch 'dev-1.2.6-doc' of https://github.com/campaign/ueditor into dev-1.2.6-doc
Merge branch 'dev-1.2.6-doc' of https://github.com/campaign/ueditor into dev-1.2.6-doc

Conflicts:
	_src/core/Editor.js
Merge branch 'dev-1.2.6-doc' of https://github.com/campaign/ueditor into dev-1.2.6-doc

Conflicts:
	_src/core/Editor.js
Merge branch 'dev-1.2.6-doc' of https://github.com/campaign/ueditor into dev-1.2.6-doc

Conflicts:
	_src/core/Editor.js
Merge branch 'dev-1.2.6-doc' of https://github.com/campaign/ueditor into dev-1.2.6-doc