Login
Merge pull request #1 from junaid-akhtar/feature-login

Login
Merge branch 'dev' into feature-register