Merge pull request #87 from dfcoffin/master

Upgrade to Spring 4.0.1.RELEASE, Spring Security 3.2.1.RELEASE, Spring Security OAuth 2.0.0.BUILD-SNAPSHOT