fixed
spring mvc
Merge branch 'master' of github.com:buele/pinwheel