初步配置了portal的action和jsp
Merge branch 'master' of ssh://git@github.com/JingkaiZhao/SaaSPower.git

Conflicts:
	IBMtechPortal/WebRoot/portal/club_contest.jsp
	IBMtechPortal/WebRoot/portal/club_into.jsp