Revert "install guardian"

This reverts commit 2866b4e3.

Conflicts:

	circle/circle/settings/base.py

circle/circle/settings/base.py

@@ -224,7 +224,6 @@ THIRD_PARTY_APPS = (
     'django_tables2',
     'django_tables2',
     'crispy_forms',
     'crispy_forms',
     'djcelery',
     'djcelery',
-    'guardian',
     'sizefield',
     'sizefield',
 )
 )
 
 
@@ -306,13 +305,6 @@ VM_ACCESS_PROTOCOLS = loads(get_env_variable('DJANGO_VM_ACCESS_PROTOCOLS',
                                                  "ssh": ["SSH", 22, "tcp"]}'''))
                                                  "ssh": ["SSH", 22, "tcp"]}'''))
 VM_SCHEDULER = 'manager.scheduler'
 VM_SCHEDULER = 'manager.scheduler'
 
 
-# Enable Guardian
-AUTHENTICATION_BACKENDS = (
-        'django.contrib.auth.backends.ModelBackend',  # django default
-        'guardian.backends.ObjectPermissionBackend',
-)
-ANONYMOUS_USER_ID = -1
-
 # Set up periodic firewall tasks
 # Set up periodic firewall tasks
 CELERYBEAT_SCHEDULE = {
 CELERYBEAT_SCHEDULE = {
     'blabla': {
     'blabla': {

requirements/base.txt

@@ -4,7 +4,6 @@ celery==3.0.23
 django-braces==1.2.2
 django-braces==1.2.2
 django-celery==3.0.23
 django-celery==3.0.23
 django-crispy-forms==1.4.0
 django-crispy-forms==1.4.0
-django-guardian==1.1.1
 django-model-utils==1.4.0
 django-model-utils==1.4.0
 django-sizefield==0.4
 django-sizefield==0.4
 django-tables2==0.14.0
 django-tables2==0.14.0