update the config.php
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
add payment pro
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
Added the twitter face book api integration and payment express
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges

Conflicts:
	gocart/themes/oneTouch/views/courseDetailsContent.php