Cambios en recuperación de contraseña.
Merge branch 'develop' of https://github.com/desarrollo-altavoz/Prontus into develop

Conflicts:
	wizard_prontus/release/release_notes.txt