Merge pull request #13 from californiavol/macbook-branch

Merge pull request #12 from californiavol/master
Merge pull request #14 from californiavol/macbook-branch

Macbook branch
Merge pull request #15 from californiavol/master

merging master into imac-work
Merge pull request #16 from californiavol/imac-work

Merge pull request #15 from californiavol/master
removed baseUrl() from link
Merge branch 'imac-work' of https://github.com/californiavol/amsvideo-dev into imac-work

Conflicts:
	application/modules/admin/views/scripts/index/_courseListBrief.phtml
Merge pull request #17 from californiavol/imac-work

Imac work
tweaked video responsive design
commented out logger - doesn't work on production server

need to find out if it's a permissions issue
added $this->baseUrl() to logo img src
Merge pull request #18 from californiavol/imac-work

Imac work
Merge pull request #19 from californiavol/master

merge from master