Fixed zip upload conflict with easy_thumbnails' thumbnail field .. it's not pretty.
Merge branch 'master' of github.com:h3/django-gallery