修改root path的格式

Signed-off-by: hancong03 <hancong03@baidu.com>
Merge branch 'dev-1.4.0' of github.com:fex-team/ueditor into dev-1.4.0
修改json注释方式
asp后台添加jsonp支持
Merge remote-tracking branch 'origin/dev-1.4.0' into dev-1.4.0
[test]
Merge branch 'dev-1.4.0' of https://github.com/fex-team/ueditor into dev-1.4.0
修改json注释方式
修改jar包

Signed-off-by: hancong03 <hancong03@baidu.com>
Merge branch 'dev-1.4.0' of github.com:fex-team/ueditor into dev-1.4.0
同步配置文件

Signed-off-by: hancong03 <hancong03@baidu.com>
Merge branch 'dev-1.4.0' of https://github.com/fex-team/ueditor into dev-1.4.0
修改json注释方式
Merge remote-tracking branch 'origin/dev-1.4.0' into dev-1.4.0
ie9关闭上传对话框报错
修改上传图片
[test]
Merge branch 'dev-1.4.0' of https://github.com/fex-team/ueditor into dev-1.4.0
fix typo
Merge pull request #18 from fex-team/dev-1.4.0

1