Patch 1.7
New TradingService.

Implemented a new TradingService.
Fixed a few misunderstadings in the WaterModel.