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

Conflicts:
	herald_league/Conf/config.php
Merge branch 'master' of https://github.com/HeraldStudio/herald_league

Conflicts:
	herald_league/Conf/config.php