commit de css
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/themes/hidrotica/css/global.css

	sites/default/files/styles/imagen_producto_resumen_280x231_/public/imagen_producto/filtros.jpg