first commit
Merge branch 'master' of https://github.com/mcamac/django-media-genie