delete web.xml
Merge branch 'master' of https://github.com/HWRcrew/Staffbase

Conflicts:
	WebContent/WEB-INF/web.xml