.
Merge branch 'master' of https://github.com/Wirzi/djangocms-example-project

Conflicts:
	example/settings.py