ui/SettingsActivity
Merge branch 'develop' of https://github.com/vergude/crittercism-api into develop