Wheel friendly
Merge pull request #97 from toban/master

broken reference to loading.gif
Test string type properly in fileplaceholder
Various fixes
Merge branch 'master' of github.com:batiste/django-page-cms

Conflicts:
	pages/placeholders.py
Try to reproduce an issue with cyricil chars
Manage to make a relevant test for the file upload string decoding bug
Fix the old test
Make the test passes with python 3
Bug fix release
Enabled user-uploaded media files serving in debug.
Added Pillow to pip requirements.

So it's possible to use ImageField (f.e in image placeholder) out of the box.
Merge pull request #99 from paolodina/patch-1

example project minor enhancements
Added ckeditor placeholder, docs, updated sample project. #95
Remove the Mixin has it was introducing bugs with the form factory
Comment
Merge branch 'master' of github.com:batiste/django-page-cms
Merge pull request #102 from paolodina/master

Added ckeditor placeholder, docs, updated sample project. #95
Fix image url in admin
Fix view on site in admin
Using mutable as named parameter is a BIG mistake.