some more stuff, password recovery  and whatnot
Merge pull request #2 from carlosluislopez/Miguel

Merge Cambios de Miguel
Merge pull request #3 from carlosluislopez/master

Pasar cambios del Master a mi Branch