Cleaned up login page
Merge branch 'dev' into gh-pages