Oops
Merge pull request #43 from A3Wasteland/AgentRev_TPG_merges

Forgot to remove conflict leftovers