Renamed BaseGateway to BaseVendorGateway to avoid conflict with PM class.
Merge branch 'master' of https://github.com/resultares/esolutions