login changed
Lots of changes
Merge branch 'master' of https://github.com/nboneh/final_app