option price
Merge branch 'master' of https://github.com/WeberStudio/UKDEV

Conflicts:
	gocart/themes/oneTouch/assets/images/app.css
	gocart/themes/oneTouch/views/mainHeader.php