solve conflicts
Merge branch 'master' of github.com:matheussl/django_multiuploader