Added supplyPowerForCities and cityPurchase in ResponseParser
Fixing merge conflicts