Signed-off-by: Fachfouch <Fachfouch@Yosr>
Merge remote-tracking branch 'origin/master'

Conflicts:
	tn.edu.esprit.gl6.highDocWeb/WebContent/WEB-INF/web.xml
	tn.edu.esprit.gl6.highDocWeb/WebContent/welcome.xhtml