removed blueprint grid span tag
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
folding in responsive styles
added partialCounter to video list
Merge pull request #1 from californiavol/imac-work

Imac work
Merge pull request #2 from californiavol/macbook-branch

Macbook branch
Merge branch 'master' into macbook-branch