f
Modify by XueWei
Merge branch 'master' of git@github.com:homechao/spring-mvc-demo.git

Conflicts:
	demo-web/pom.xml