Spring xml configuration instead of annotations
Merge branch 'issue/41' of github.com:icehockeystar/militaryshop into issue/41

Conflicts:
	src/main/webapp/WEB-INF/spring/dispatcher-servlet.xml
	src/main/webapp/WEB-INF/spring/web-application-context.xml