support custom user model
Merge branch 'django-1.7' into rizumu

Conflicts:
	ping/checks.py