on request of junaid
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges

Conflicts:
	gocart/controllers/admin/admin.php
ok