eliminada agrupacion de estados
acciones before (beta)
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/model_gestion.php
	documentos/cambios_sql.sql
	documentos/modelo db.mwb