User model aanpassingen"
merge conflict fixed
Merge branch 'niels-user-model' of https://github.com/PythonUnited/django-cms into niels-user-model

Conflicts:
	cms/signals.py