update auth user model
update auth user model
Merge remote-tracking branch 'github/master'

Conflicts:
	mxsite/settings.py
update auth user model
update auth user model