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

Conflicts:
	herald_league/Runtime/Cache/League/3803d886f994e47f33e05615fb8eec03.php
	herald_league/Runtime/Cache/League/746468d095a0403251a0e68c62a3a9ee.php
	herald_league/Runtime/Cache/League/7ad9d86a10c4378ebeb22fca0422e289.php
	herald_league/Runtime/Cache/League/9b1ca22bde636d4945be30f6f3c183f8.php
	herald_league/Runtime/Cache/League/bc62e3a05f194a7c75cabc3ce8d296ad.php
	herald_league/Runtime/Cache/League/c5c45f5e748e60b4881a89363777d9d5.php
	herald_league/Runtime/Cache/League/cfa5cd2d627c4fe2a4fa99cfb6180053.php
	herald_league/Runtime/Cache/League/d00502de745bfb4f137d96ac98e0f99c.php
	herald_league/Runtime/Cache/League/f154d6e1689a6f6c5152749ff588bf03.php