补充上传xml及修改文件管理bug
Merge remote-tracking branch 'origin/master' into newSet