Add support for django custom User model
Merge branch 'custom-user-model'