cambios incompletos
Merge branch 'nuevosfeatures' into pwdrecovery
Password recovery
Password recovery
Merge branch 'nuevosfeatures'
Merge branch 'nuevosfeatures' of https://github.com/bbardelli/prode2014 into nuevosfeatures