navera
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
done
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
navera
navera aziz
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
checking
checkkk
login page updated
chcking
check
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges

Conflicts:
	gocart/views/admin/admins.php
	gocart/views/admin/login.php