--- a/src/ldtplatform/settings.py	Fri Mar 01 18:08:40 2013 +0100
+++ b/src/ldtplatform/settings.py	Thu May 23 00:24:23 2013 +0200
@@ -65,7 +65,6 @@
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-#ADMIN_MEDIA_PREFIX = '/media/'
 
 #LDT_MEDIA_PREFIX = '/ldt/'
 
@@ -130,28 +129,31 @@
     'django.contrib.admin',
     'django.contrib.staticfiles',
     'haystack',
-    'ldtplatform',
-    'registration',
+    'tastypie',
+    'guardian',
     'tagging',
-    'ldt',
-    'ldt.core',
-    'ldt.ldt_utils',
-    'ldt.text',
-    'ldt.user',
-    'ldt.management',
-    'ldt.indexation',
+    'registration',
     'oauth_provider',
     'django_openid_consumer',
     'social_auth',
     'south',
-    'guardian',
     'sorl.thumbnail',
-    'tastypie',
-    'hashcut',
+    'ldt',
+    'ldt.core',
+    'ldt.security',
+    'ldt.user',
+    'ldt.ldt_utils',
+    'ldt.text',
+    'ldt.management',
+    'ldt.indexation',
+#    'hashcut',
     'chunked_uploads',
+    'ldtplatform',
 )
 
-AUTH_PROFILE_MODULE = 'user.UserProfile'
+#AUTH_PROFILE_MODULE = 'user.UserProfile'
+AUTH_USER_MODEL = 'user.LdtUser'
+INITIAL_CUSTOM_USER_MIGRATION = "0009_rename_auth_user_to_user_ldt_user"
 
 DECOUPAGE_BLACKLIST = (
      "de_PPP",
@@ -175,9 +177,9 @@
     'django.contrib.auth.backends.ModelBackend',
     'guardian.backends.ObjectPermissionBackend',
 )
-SOCIAL_AUTH_IMPORT_BACKENDS = (
-    'myproy.social_auth_extra_services',
-)
+#SOCIAL_AUTH_IMPORT_BACKENDS = (
+#    'myproy.social_auth_extra_services',
+#)
 
 ACCOUNT_ACTIVATION_DAYS = 7 
 
@@ -266,11 +268,6 @@
 if not "LOGIN_ERROR_URL" in locals():
     LOGIN_ERROR_URL = SRC_BASE_URL + 'accounts/login'
 
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-if not "ADMIN_MEDIA_PREFIX" in locals():
-    ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'
 # Used in a lot of templates
 if not "LDT_MEDIA_PREFIX" in locals():
     LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/'
@@ -281,5 +278,6 @@
 #forced settings    
 MAX_TAG_LENGTH = 255
 FORCE_LOWERCASE_TAGS = True
+