[B2169] Textbox variants
[B2169]
[B2169]
[B2169] Option text fix
Update shopping_cart.php
Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop
Merge remote-tracking branch 'remotes/origin/B2169' into develop

Conflicts:
	catalog/includes/modules/variants/text_field.php
	catalog/templates/core/content/checkout/shopping_cart.php
merge work