Merge pull request #126 from californiavol/master

Merge from master
Merge pull request #127 from californiavol/master

Merge from master
added stream controller to admin module
added Stream controller, model and views
added crud actions to streamcontroller
added rss output example
added rss output of course videos
added setheader to xml in video controller rss action
Merge pull request #130 from californiavol/imac-work

Imac work
Merge pull request #131 from californiavol/master

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

Macbook branch
added embed video function
deleted two unnecessary js files for jwplayer
embed still not working completely
Merge pull request #133 from californiavol/imac-work

Imac work
Merge pull request #135 from californiavol/master

merge from master