Merge remote-tracking branch 'origin/master'

Conflicts:

	jee/tpecommerce/src/main/java/com/epsi/tpecommerce/controller/CatalogueServlet.java
	jee/tpecommerce/src/main/java/testBDD.java
	jee/tpecommerce/src/main/webapp/WEB-INF/web.xml