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