Merge branch 'master' of https://github.com/antonov/feedfilms

Conflicts:
	application/controllers/IndexController.php
	application/layouts/scripts/layout.phtml