compatibility with custom user models

Conflicts:
	cms/models/moderatormodels.py
	cms/models/permissionmodels.py