changes for 2-3
no shipment_inc_vat necessary
Merge branch 'master' into 2-3-stable

Conflicts:
	spree_german_market.gemspec