Merge branch 'master' into LoginPage
Login_Activity Commit
Merge branch 'LoginPage'