Fixing tests
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	common/mbm-client/src/test/java/org/multibit/mbm/client/handlers/item/ClientItemCollectionHandlerTest.java
	mbm/src/test/java/org/multibit/mbm/core/pricing/PriceCalculatorTest.java
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Interim commit (broken tests)
Fixing representations