评论回复
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0

Conflicts:
	project/herald_league/herald_league/Lib/Action/User/IndexAction.class.php
	project/herald_league/herald_league/Tpl/User/Index/index.html