login and semua pages
Merge branch 'master' into production