First change to solve Filter problems
Merge branch 'origin/Solfamidas'
Merge branch 'origin/Solfamidas'
Testing Filtro
Merge branch 'origin/Solfamidas'

Conflicts:
	src/main/webapp/WEB-INF/pages/coche/filtro.jsp
Solving filter (50%)
Merge branch 'origin/Solfamidas'