个人中心
Merge branch 'master' of https://github.com/li1993hao/xiandai

Conflicts:
	app/tpl/account/register.htm