文案修改
Merge branch 'master' of https://github.com/lantianlz/qiexing

Conflicts:
	www/templates/account/regist.html