Merge branch 'master' into people_overhaul
remove unused file
remove some references to the Investor service where easy
Merge branch 'people_overhaul' into testing