Merge branch 'release/0.9.6' into develop
dev version bump to 0.9.7a1.dev1
Safe translation of "file missing" in JavaScript

File uploader button is not working when using django in Catalan, because the translation of "file missing" is breaking the Javascript code.

I propose to use this translation escaped. It should not be modified at the translation, as this text appears in another file, in normal html.
Scape translation of file missing

I've followed @yakky recommendations to scape "file missing" (apply escapejs filter without setting a variable for the translation)
Merge pull request #420 from bielfrontera/patch-1

Safe translation of "file missing" in JavaScript
Replace use of force_str by force_text

This fixes #422
Build random path using os.path.join
Disallow copying folders to self

This fixes #421
Merge pull request #423 from bikeshedder/develop

Fix encoding issues and endless recursion
Fixed migration custom User compatibility.
Merge pull request #425 from fusionbox/support_custom_user_models_in_migrations

Fixed migration custom User compatibility.
adds coverage support for shippable
thumbnails: add zoom support
Merge pull request #428 from Chive/feature/thumbnail-zoom

thumbnails: add zoom support
bumps version to 0.9.7
Merge branch 'release/0.9.7'