Updates to Activity, prepare Robolectric tests
Merge branch 'develop' of https://github.com/SmokSmog/smoksmog-android into develop