Login page now uses template inheritance
Merge branch 'master' into production