cambios esteticos

ajustes de interface
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/angular/partials/filtro.html
	web/index.html