update free shippping info box
Merge branch 'shippinginfo' into dev

Conflicts:
	app/code/local/Polcode/CustomerLocator/Block/Shipping.php
	app/code/local/Polcode/CustomerLocator/etc/config.xml
	app/design/frontend/default/greenlights/template/page/html/free-shipping-price.phtml