Improves slot placeholder

Conflicts:

	example/content/templates/home.html
	placeholder/slot/admin.py
	placeholder/slot/models.py
Fixes middleware
Improves placeholder registration
Merge branch 'staging'

Conflicts:
	placeholder/__init__.py