Added required methods to Continenet and Port to complete TradeGood's CalculatePrice method
Merge origin/master
Merge origin/master