Merge pull request #33 from californiavol/macbook-branch

Merge pull request #32 from californiavol/master
Merge pull request #34 from californiavol/macbook-branch

Macbook branch
Merge pull request #35 from californiavol/master

Merge master into imac-work
Merge pull request #36 from californiavol/imac-work

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

updated live1 layout
switch application_env to production
updated live streaming layout markup
removed from empty spaces from index.php
Merge pull request #38 from californiavol/imac-work

Imac work - merge into master
 changed case in function name
updated bootstrap CDN and cleaned up csv parser
Merge pull request #39 from californiavol/imac-work

Imac work
added $this->baseUrl() to osmf.js src
added height width to html5 player
Merge pull request #40 from californiavol/imac-work

Imac work
adding fields to videos table

time available, etc
Merge pull request #41 from californiavol/imac-work

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

merge from master
Merge pull request #43 from californiavol/imac-work

Merge pull request #42 from californiavol/master