Fix incorrect example
Use AUTH_USER_MODEL consistently between various Django versions. Closes #946
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rest_framework/compat.py