Merge pull request #10 from californiavol/imac-work

Merge pull request #9 from californiavol/master
Merge pull request #11 from californiavol/imac-work

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

merge master into macbook-branch
Merge pull request #13 from californiavol/macbook-branch

Merge pull request #12 from californiavol/master
updated admin module auth and acl
updated admin nav menu
Merge pull request #14 from californiavol/macbook-branch

Macbook branch
Merge pull request #15 from californiavol/master

merging master into imac-work