deleted web.xml
Merge branch 'master' of github.com:idega/is.idega.idegaweb.member

Conflicts:
	WEB-INF/web.xml
deleted web.xml again