changes made
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges

Conflicts:
	gocart/views/admin/admins.php
resolved
commit
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges