web.xml
Merge remote-tracking branch 'origin/master'

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