修改模板 社团空间
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0

Conflicts:
	project/herald_league/Uploads/LeaguePost/Large/1.jpg
	project/herald_league/Uploads/LeaguePost/Large/2.jpg
	project/herald_league/Uploads/LeaguePost/Small/1.jpg
	project/herald_league/Uploads/LeaguePost/Small/2.jpg
	project/herald_league/herald_league/Lib/Model/AttentionModel.class.php