MarketPlace mostly tested (can't test calculatePrices()). MarketPlace amounts now within proper bounds
Merge origin/master