Main activity features
Merge branch 'master' of https://github.com/Morlack/Smoke-B-Gone