修改密码
FAQ
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	server/publications.coffee
Merge branch 'master' of https://github.com/bigzhu/shuqian