Merge pull request #134 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
added base url to images src
library layout tweaks to styles
added playlist module

with index & admin controller
added playlist layout

TODO: controller not finding playlist model
Merge pull request #138 from californiavol/macbook-branch

Macbook branch
Merge pull request #139 from californiavol/master

Merge from master
Merge pull request #140 from californiavol/imac-work

Merge pull request #139 from californiavol/master
Merge pull request #141 from californiavol/master

Merge from master