用户
Merge branch 'master' of https://github.com/xiangrui-zeng/AppStoreNew
gritfs相关
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/index.js