Updated login
Merge branch 'master' of https://github.com/1000Springs/web-app