terminando el login
Merge branch 'master' into developer