Allow defaulting to cheapest or most expensive shipping method
added composer
updated composer
updated composer
Merge branch 'master' into ss3

Conflicts:
	code/extensions/CheckoutStep_ShippingMethod.php