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

Conflicts:
	project/herald_league/herald_league/Lib/Model/AttentionModel.class.php
	project/herald_league/herald_league/Runtime/Logs/13_01_25.log
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0