make the media library work properly with s3
Merge branch 'master' of https://github.com/TAPP-TV/cms