...
Merge branch 'refactor' of https://github.com/meneerraaf/7plus8-android into refactor