[DEV-1152]

Anywhere you import User from django.contrib.auth.models, I would import it as ```AuthUser``` just for clarity in the code.