Monica, Radu: Use Spring Java Configuration in stubwebservice.
Merge remote-tracking branch 'origin/master'

Conflicts:
	taxcalculator/taxcalculator-stubwebservice/src/main/resources/spring-servlet.xml