Merge pull request #18 from jvrdom/develop

Merge from develop
Merge pull request #19 from jvrdom/hp-dev

cambio de pass en conexion a la base
Merge pull request #20 from jvrdom/develop

Develop