应用展示与service相连接
Merge branch 'master' of https://github.com/lettoosoft/weixin-front

Conflicts:
	scripts/shared/main.js