added free shipping option for product
small fix
changing words for shipping
added free shipping widget
Merge branch 'develop' into feature/coupons

Conflicts:
	system/app/Tools/ShoppingCart.php