update SampleServlet + web.xml
Merge branch 'master' of https://github.com/nonzenz/snoopy.git

Conflicts:
	Valimised/war/WEB-INF/web.xml