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

Conflicts:
	Database/ukopencollege.sql
	gocart/controllers/admin/products.php
	gocart/models/product_model.php
	gocart/themes/oneTouch/views/header.php
	gocart/views/admin/product_form.php