Merge pull request #16 from rockamorales/master

Modificaciones a consulta
Merge pull request #117 from mackk/master

admin