Added webapp
Merge branch 'master' of github.com:cjmalloy/spring-test
Updated java version.