CAS-1462: Upgrade Spring/SWF dependencies to 4.x and 2.3.3
CAS-1462: updated servlet-api to 3.x, to be compatible with spring 4
Merge branch 'master' into CAS-1462

Conflicts:
	pom.xml
CAS-1462: corrected oauth test cases. mock-httprequest omits default ports
Merge pull request #441 from Unicon/CAS-1462

CAS-1462: Upgrade Spring/SWF dependencies to 4.x and 2.3.3