正在做App登录
Merge branch 'master' of https://github.com/r2space/AppstoreWeb

Conflicts:
	controllers/ctrl_app.js
	modules/mod_app.js
App 登录