Merge branch 'development' into contributors

scipost/models.py

@@ -10,7 +10,6 @@ import string
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AbstractUser
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from django.utils import timezone
@@ -37,11 +36,6 @@ def get_sentinel_user():
     return Contributor.objects.get_or_create(status=DISABLED, user=user)[0]
 
 
-class User(AbstractUser):
-    class Meta:
-        db_table = 'auth_user'
-
-
 class Contributor(models.Model):
     """A Contributor is an academic extention of the User model.