[fixed] by xuheng
Merge branch 'master' of https://github.com/campaign/ueditor2.x

Conflicts:
	themes/base/dialog.css
Merge branch 'master' of https://github.com/campaign/ueditor2.x

Conflicts:
	themes/base/dialog.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/base/dialog.css