Added login activity
Merge branch 'login' into dev