Merge pull request #123 from californiavol/master

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

Merge from master
Merge pull request #128 from californiavol/webs-web1dev

Merge pull request #123 from californiavol/master
Merge pull request #129 from californiavol/master

Merge from master
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
Merge pull request #133 from californiavol/imac-work

Imac work
Merge pull request #134 from californiavol/master

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

merge from master
Merge pull request #136 from californiavol/webs-web1dev

Webs web1dev
Merge pull request #137 from californiavol/macbook-branch

Merge pull request #134 from californiavol/master
working on video rss
Merge branch 'macbook-branch' of https://github.com/californiavol/amsvideo-dev into macbook-branch

Conflicts:
	application/controllers/VideoController.php
deleted osmf.js and player.js
still working on embed
embed almost finished - also added layout partials
embed function now working

output code to text area and loads osmf player to test the code.
added library controller to library module
started work on library controllers actions views

added osmfplayer and related videos mockup to index