resolve merge conflicts
Merge branch 'master' of https://github.com/sanket226/spring-mvc-tuts.git