新年后第一次提交！！
Merge branch 'master' of https://github.com/HeraldStudio/league_2.0

Conflicts:
	project/herald_league/Public/Css/activity.css
	project/herald_league/Public/Css/index.css
	project/herald_league/Public/Css/wowslider-container1.css
	project/herald_league/Public/Js/script.js
	project/herald_league/herald_league/Lib/Model/ActivityModel.class.php
	project/herald_league/herald_league/Runtime/Logs/13_01_31.log