finish populating activity_middle_man_main
Merge branch 'master' of https://github.com/samjhill/MiddleMan