various changes to the model, reset of the value price
changed default values
Merge branch 'master' of ssh://github.com/rik-coenders/2io71

Conflicts:
	2io71.nl/deployment/OrderToShipment.jar