wrong var name
Merge branch 'develop' into email2profile

Conflicts:
	assembl/auth/models.py