Merge pull request #5 from californiavol/imac-work

Imac work
Merge pull request #6 from californiavol/imac-work

started auth and acl
Merge pull request #7 from californiavol/macbook-branch

Macbook branch
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
Merge pull request #10 from californiavol/imac-work

Merge pull request #9 from californiavol/master
updated filename for videos
Merge pull request #11 from californiavol/imac-work

updated filename for videos
Merge pull request #12 from californiavol/master

merge master into macbook-branch