Added a new login page to the app. Updated the cucumber tests <Jaksha>
Resolving the merge conflicts <Jaksha>
Commit after merge