Commit Live Files To Git
Merge branch 'master' of https://github.com/WeberStudio/UKDEV

Conflicts:
	gocart/controllers/shipping_order.php
Order changes
Merge branch 'master' of https://github.com/WeberStudio/UKDEV