login view, and models updated.
Merge remote-tracking branch 'origin/master'