Merge branch 'master' of https://github.com/SpiderOak/SpiderOakMobileClient into further-adventures-in-branding