modify web.xml
Merge branch 'master' of https://github.com/d12e493/spring-data.git

Conflicts:
	src/main/webapp/WEB-INF/web.xml