updated login pages
Merge branch 'master' into redesign