Changes from
Merge remote-tracking branch 'refs/remotes/origin/MyLaravel' into Studio15

Conflicts:
	app/config/app.php
	app/models/Biography.php
	app/models/Film.php
Merge branch 'refs/heads/master_develop' into Studio15
removed ListContentController and redid code in other controllers
Merge pull request #1 from gandm/Studio15

Studio15