estado en historial e incidencia
Merge branch 'master' of https://github.com/jjrubio/PlataformaGEM