remove unused activities and layouts
add drawables, add before/after to flow
Merge branch 'master' of https://github.com/japacible/DashTricks-Pakistan