Merge branch 'master' of https://github.com/nocode2k/spring3-mvc-example.git
confilct resolved
Merge branch 'master' of https://github.com/nocode2k/spring3-mvc-example.git
conflict resolved