change folder name in htaccess
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges
Merge branch 'master' of https://github.com/WeberStudio/UKOpenColleges

Conflicts:
	uploads/images/full/thumb_14.jpg
	uploads/images/small/thumb_14.jpg
	uploads/images/thumbnails/thumb_14.jpg