Merge pull request #36 from californiavol/imac-work

Merge pull request #35 from californiavol/master
Merge pull request #37 from californiavol/imac-work

updated live1 layout
Merge pull request #38 from californiavol/imac-work

Imac work - merge into master
Merge pull request #39 from californiavol/imac-work

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

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

adding fields to videos table
Merge pull request #42 from californiavol/master

merge from master