Cambios en filtro
Merge branch 'Solfamidas' of
https://github.com/maiteyanguas/innova4b-daw-modulo7-empresaReparto.git
into Solfamidas

Conflicts:
	src/main/webapp/WEB-INF/pages/coche/filtro.jsp
Merge branch 'Solfamidas' of https://github.com/maiteyanguas/innova4b-daw-modulo7-empresaReparto.git into Solfamidas