改进 Issue #145 上传页面
Merge branch 'master' of https://github.com/typecho/typecho

Conflicts:
	admin/editor-js.php