added future stuff
Merge branch 'master' of https://github.com/stevleibelt/media_library