cambios repentinos login

quite un modal dialog para la recuperacion de contraseña
Merge remote-tracking branch 'origin/PROD' into PROD

Conflicts:
	login.html