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
Merge pull request #81 from californiavol/macbook-branch

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

Imac work
Merge pull request #84 from californiavol/master

merge master into macbook-branch