[PAXWEB-521] - Create a spring based war sample
Merge branch 'master' of git@github.com:ops4j/org.ops4j.pax.web.git

Conflicts:
	samples/war-spring/pom.xml
	samples/war-spring/src/main/java/org/ops4j/pax/web/samples/spring/controller/HelloWorldController.java