Merge pull request #74 from californiavol/master

merge from master
Merge pull request #75 from californiavol/master

merge from master
added test controller to admin module
Merge pull request #77 from californiavol/macbook-branch

Macbook branch
Merge pull request #78 from californiavol/imac-work

Merge pull request #74 from californiavol/master
Merge pull request #79 from californiavol/master

merge from master
Merge pull request #80 from californiavol/master

merge from master
added dynamic vars to strobeplayer for test streams
added div id to html5 video tag
added link to test streams from admin interface
added embed action and view
Merge pull request #81 from californiavol/macbook-branch

Macbook branch
Merge pull request #82 from californiavol/imac-work

Imac work
Merge pull request #85 from californiavol/master

merge from master