Merge pull request #578 from bhariharan/unstable

Removing trim() calls
Bug fix for login screen back button issue
Bug fix for account removal from settings
Merge pull request #580 from bhariharan/master

Bug fix for login screen back button issue
Merge branch 'master' into unstable