cambios en login singup etc (Coherentes)
Merge remote-tracking branch 'origin/master'