web.xml conflict issue
Merge branch 'master' of https://github.com/iraklivasha/taxiWeb.git

Conflicts:
	taxiWeb/WebContent/WEB-INF/web.xml