Filtros y ordenes
Merge branch 'masive_treatment_filter'

Conflicts:
	config/locales/es.yml