Merge remote-tracking branch 'origin/master'

Conflicts:
	views/starwall.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/starwall.html
Merge branch 'master' of https://github.com/xiangrui-zeng/AppStoreNew

Conflicts:
	routes/index.js
Merge branch 'master' of https://github.com/xiangrui-zeng/AppStoreNew

Conflicts:
	routes/index.js
页面跳转完善
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/app_add_select.html
	views/app_list.html
	views/starwall.html
Merge branch 'developer' of https://github.com/xiangrui-zeng/AppStoreNew

Conflicts:
	views/app_add_select.html
	views/app_add_step_1.html
	views/app_add_step_2.html
	views/app_list.html
	views/starwall.html