front end commit categories
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges

Conflicts:
	gocart/config/gocart.php
	gocart/themes/oneTouch/assets/css/app.css
	gocart/themes/oneTouch/views/footer.php
	gocart/themes/oneTouch/views/header.php
	gocart/themes/oneTouch/views/leftPanel.php
	gocart/themes/oneTouch/views/mainHeader.php
	gocart/themes/oneTouch/views/portfolio-masonry.php