下载修正
Merge branch 'master' of https://github.com/r2space/AppstoreWeb

Conflicts:
	api/file.js