aa
Merge branch 'master' of https://github.com/HeraldStudio/herald_league

Conflicts:
	herald_league/Tpl/League/Admin/changeinfo.html
Merge branch 'master' of https://github.com/HeraldStudio/herald_league