同步系统上传文件逻辑变动
Merge branch 'master' of git@github.com:hizhengfu/typecho_kindeditor.git

Conflicts:
	Upload.php