init project
update spring version
Merge remote-tracking branch 'origin/master' into new

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/pages/hello.jsp
	src/main/webapp/WEB-INF/web.xml