Wheel friendly
Test string type properly in fileplaceholder
Various fixes
Merge branch 'master' of github.com:batiste/django-page-cms

Conflicts:
	pages/placeholders.py