Update media model
Merge branch 'master' of github.com:TeamGlorious/explorify

merge conflict
Merge pull request #13 from MooreJesseB/master

Update media model
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Group merge
Connect map to trips show