by zhanyi
by zhanyi
Merge branch 'master' of https://github.com/campaign/ueditor2.x
by zhanyi
by zhanyi
by zhanyi
by zhanyi
Merge remote-tracking branch 'origin/master'

Conflicts:
	_src/adapter/adapter.js
	_src/ui/modal.js