historico done
Merge branch 'master' of https://github.com/comiguel/inventario-2.0