Removed mainActivity from start of Login
Merge branch 'branchmarc'
Sorts out merge conflict