Update
Merge branch 'master' of https://github.com/tomas1000r/spring-mvc-test