暂时去掉了在htmlparser中inline不能嵌套block的修复
更新值日
更新日志
Merge remote-tracking branch 'origin/dev-1.4.0' into dev-1.4.0

Conflicts:
	changelog.md
[test]
Merge pull request #164 from worry127722/dev-1.4.0

Dev 1.4.0
Merge branch 'dev-1.4.0' of https://github.com/fex-team/ueditor into dev-1.4.0
修改简单上传图片,把表单和文件域放到按钮位置
Merge remote-tracking branch 'origin/dev-1.4.0' into dev-1.4.0
ie9不支持FileReader
ie9不支持FileReader
修复ie11下的unselectable方法
Merge remote-tracking branch 'origin/dev-1.4.0' into dev-1.4.0
[test]source table.cmds
Merge branch 'dev-1.4.0' of https://github.com/fex-team/ueditor into dev-1.4.0
Merge pull request #19 from fex-team/dev-1.4.0

1