上传功能 添加（未完成）
Merge branch 'master' of https://github.com/xiangrui-zeng/AppStoreNew

Conflicts:
	apis/application.js
	controllers/ctrl_app.js
	modules/mod_category.js
Merge branch 'master' of https://github.com/xiangrui-zeng/AppStoreNew

Conflicts:
	apis/application.js
	controllers/ctrl_app.js
	modules/mod_category.js