Merge pull request #132 from Diekrul/master

copiando desde G2 a G1
petición de barra lateral reportes
Merge pull request #133 from Diekrul/master

Copiando de G1 a G2
Merge pull request #22 from wigtor/master

Copiando de G1 a G2