forget password
Merge branch 'master' of https://github.com/lettoosoft/weixin-front

Conflicts:
	scripts/shared/main.js
	views/pages/signup.html
解决冲突
Merge branch 'master' of https://github.com/lettoosoft/weixin-front