Bug fixing

Corrected gramatical error in strings.  Fixed bug where data protection
flag was not reset even when last account removed.  A couple of minor
coding improvements.
Bug fix

Fixes MOBILE-1382 and a couple of string issues.
Merge conflict resolved
Merge pull request #75 from ldjagger/master

Bug fixing.