#212 Fixed media permalink on manage_media page
Merge pull request #213 from pencilblue/PB212

#212 Fixed media permalink on manage_media page
Merge branch 'master' into story/S3Plugin
Fix for preparing for S3 plugin