cambios
sadasMerge remote-tracking branch 'origin/master'

Conflicts:
	consumo.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Cambio en los textos de listado de inconsistencias