Merge remote-tracking branch 'ludovic/master'

Conflicts:
	ecommerce/.classpath
	ecommerce/.project
	ecommerce/.settings/org.eclipse.jdt.core.prefs
	ecommerce/.settings/org.eclipse.wst.common.component
	ecommerce/.settings/org.eclipse.wst.common.project.facet.core.xml
	ecommerce/src/main/webapp/WEB-INF/views/rechercheproduit.jsp
	ecommerce/src/main/webapp/WEB-INF/views/utilisateurs.jsp
Merge remote-tracking branch 'bettyfava/master'

Conflicts:
	ecommerce/.classpath
	ecommerce/.project
	ecommerce/.settings/org.eclipse.jdt.core.prefs
	ecommerce/.settings/org.eclipse.wst.common.component
	ecommerce/.settings/org.eclipse.wst.common.project.facet.core.xml