Merge branch 'imac-work' into macbook-branch
Merge remote-tracking branch 'origin/imac-work' into macbook-branch
markup structure and css refactor
Merge branch 'macbook-branch' of https://github.com/californiavol/amsvideo-dev into macbook-branch
Merge branch 'macbook-branch' into imac-work

Conflicts:
	application/controllers/AdminController.php
	application/controllers/IndexController.php
	application/models/DbTable/Courses.php
	application/views/scripts/admin/index.phtml