Merge branch 'imac-work' into macbook-branch
Merge branch 'imac-work' into macbook-branch
Merge branch 'imac-work' into macbook-branch
Merge pull request #5 from californiavol/imac-work

Imac work
Merge branch 'macbook-branch' of https://github.com/californiavol/amsvideo-dev into macbook-branch

Conflicts:
	application/controllers/IndexController.php
	application/views/scripts/index/_courseVideoLoop.phtml
Merge pull request #6 from californiavol/imac-work

started auth and acl
Merge branch 'imac-work' into macbook-branch

Conflicts:
	application/controllers/IndexController.php
	application/views/scripts/index/_courseVideoLoop.phtml
Merge pull request #7 from californiavol/macbook-branch

Macbook branch
added sac state smtp mail transport - added role option to register form
Merge pull request #8 from californiavol/macbook-branch

added sac state smtp mail transport - added role option to register form
Merge pull request #9 from californiavol/master

Merge master into imac-work