Merge pull request #101 from mastercoin-MSC/rebrand

Sync from master
Rebrand: Cleanup Setting page, Fix logout
Merge pull request #1191 from achamely/rebrand-stage

Rebrand: Cleanup Settings Page, Fix logout