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

Conflicts:
	gocart/controllers/admin/admin.php
	gocart/views/admin/admin_form.php
	gocart/views/admin/includes/admin_profile.php