user root folder
refactor and fix
settings fix
Added feature to dump payload of files using manage.py dumpdata
refactor
Merge branch 'develop' of https://github.com/stefanfoulis/django-filer into serialize-payload
Merge branch 'develop' into serialize-payload

Conflicts:
	filer/fields/multistorage_file.py
Rebased PR#382 from rollstudio to the latest develop branch, b240633
Added extra hint for importing dumped data
Update README.rst

Add : or Pillow 2.3.0 (with JPEG and ZLIB support, Better to use Pillow)
Merge pull request #383 from jrief/serialize-payload

Rebased PR#382 'Fixed loaddata raising IOError' from rollstudio
Merge pull request #384 from obigroup/patch-1

Update README.rst
Merge pull request #333 from darbula/feature/issue-329-user-root-folder

User root folder
Revert "Reset migrations to follow current South standards. Fixes #363."

This reverts commit fc1686dfd821d66bab3aab9cbbc5f5dad24df289.
Add support for migrations in tests
Update migrations
Switch to south testing by default
Compendium PR for easy-thumbnails #300
Merge pull request #389 from jrief/retina-display

Compendium PR for easy-thumbnails #300
Comparisons against None should always use is