Merge branch 'release/1.3' into develop
Removed unnecessary mimetypes from templates
Merge branch 'master' of https://github.com/richardcornish/django_compressor into develop