merge
Merge branch 'master' of https://github.com/teknomanBlade/eCommerce.git

Conflicts:
	ecommerce-web/src/main/java/web/ecommerce/tpfinal/ecommerce_web/controller/Busqueda2Controller.java
	ecommerce-web/src/main/webapp/WEB-INF/tiles/header.jsp