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

Conflicts:
	project/herald_league/herald_league/Runtime/Logs/13_02_02.log
	project/herald_league/herald_league/Runtime/Logs/13_02_03.log
	project/herald_league/herald_league/Runtime/Logs/13_02_15.log
	project/herald_league/herald_league/Runtime/Logs/13_02_17.log
	project/herald_league/herald_league/Runtime/Logs/13_02_18.log
	project/herald_league/herald_league/Runtime/Logs/13_02_19.log
	project/herald_league/herald_league/Runtime/Logs/13_02_20.log
	project/herald_league/herald_league/Runtime/Logs/13_03_02.log
	project/herald_league/herald_league/Runtime/Logs/13_03_03.log
完成了社团空间页面的现实
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0