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

Conflicts:
	project/herald_league/herald_league/Lib/Action/Activity/AddActivityAction.class.php
	project/herald_league/herald_league/Lib/Action/League/LoginAction.class.php
	project/herald_league/herald_league/Lib/Model/UserSessionControlModel.class.php