aaaa
o
Merge branch 'master' of https://github.com/viacola/springmvc

Conflicts:
	mvc/src/main/java/com/springapp/mvc/controller/UserRest.groovy
	mvc/target/m2e-wtp/web-resources/META-INF/maven/com.ailk/mvc/pom.properties

okkkk