fixed merge conflicts
Merge pull request #57 from dbcfoxes2014/view_own_created_media

fixed merge conflicts