temporly fixed the issue caused by the login page. (unfinished login page).
Merge branch 'non-css' into develop