taking pull
Merge branch 'master' of https://github.com/WeberStudio/UKDEV

Conflicts:
	gocart/controllers/shipping_order.php
	gocart/themes/oneTouch/views/fast_checkout_setp3.php
unregister user validation