More work on login
Merge branch 'master' of https://github.com/ljnutal6/media-recommend.git