Upgraded to spring 4
Added spring security JARs to Maven POM, changed XML namespaces
Missed an XML file
Fixed Content.java
Merge branch 'master' of github.com:ThreeToes/simplecms