合并代码
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0

Conflicts:
	project/herald_league/herald_league/Tpl/League/Home/club.html
	project/herald_league/herald_league/Tpl/Public/Search/search.html
	project/herald_league/herald_league/Tpl/User/Index/index.html
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0