push
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0

Conflicts:
	project/herald_league/herald_league/Lib/Action/League/HomeAction.class.php
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0