bug  fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/file.js
Merge branch 'master' of https://github.com/r2space/AppstoreWeb

Conflicts:
	api/file.js
Merge remote-tracking branch 'origin/master'