Merge pull request #3 from californiavol/macbook-branch

Macbook branch
Merge branch 'master' into imac-work

Conflicts:
	application/views/scripts/index/index.phtml
started auth and acl
Merge branch 'imac-work' into macbook-branch

Conflicts:
	application/controllers/IndexController.php
	application/views/scripts/index/_courseVideoLoop.phtml