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