reslove tab sulotion
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges

Conflicts:
	gocart/models/category_model.php
	gocart/themes/oneTouch/assets/css/simpletabs.css
	gocart/themes/oneTouch/views/content.php
	gocart/themes/oneTouch/views/courseDetailsContent.php