Upgraded to current libraries.
Proved we can run from within Tomcat.
Fixed the Spring contexts for IntelliJ.