shipping info update
Merge branch 'shippinginfo' into dev

Conflicts:
	app/code/local/Polcode/CustomerLocator/Block/Shipping.php