switched to Spring 3.1.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
formatted pom.xml
finally got Spring to map requests
deleted test.xml