Getting up-to-date code at work
Merge branch 'master' of https://github.com/ipolding/spring-webapp