diff -r 993f18158ccb -r 321b15537f8e src/ldtplatform/urls.py
--- a/src/ldtplatform/urls.py	Thu May 28 11:07:24 2015 +0200
+++ b/src/ldtplatform/urls.py	Thu May 28 13:17:03 2015 +0200
@@ -1,54 +1,47 @@
+from ldt.auth.views import login as pf_login
+from ldt.text import VERSION_STR
+
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views.generic import RedirectView
-from ldt.auth.views import login as pf_login
-from ldt.text import VERSION_STR
+
 
 #from django.conf import settings
-
-# Uncomment the next two lines to enable the admin:
-admin.autodiscover()
-
 js_info_dict = {
     'packages': ('django.contrib.admin',), 
 }
 
-urlpatterns = patterns('',
+urlpatterns = [
     # Example:
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
     # to INSTALLED_APPS to enable admin documentation:
     # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
-    # Uncomment the next line to enable the admin:
-    (r'^admin/', include(admin.site.urls)),
-    (r'^i18n/', include('django.conf.urls.i18n')),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^i18n/', include('django.conf.urls.i18n')),
 
-    (r'^ldt/', include('ldt.ldt_utils.urls')),
-    (r'^user/', include('ldt.user.urls')),
-    (r'^api/', include('ldt.api.urls')),
-    (r'^api/' + VERSION_STR + '/text/', include('ldt.text.urls')),
+    url(r'^ldt/', include('ldt.ldt_utils.urls')),
+    url(r'^user/', include('ldt.user.urls')),
+    url(r'^api/', include('ldt.api.urls')),
+    url(r'^api/' + VERSION_STR + '/text/', include('ldt.text.urls')),
 
-    (r'^auth_accounts/', include('registration.backends.simple.urls')),
+    url(r'^auth_accounts/', include('registration.backends.simple.urls')),
 
-    #(r'^accounts/', include('socialauth.urls')),
-    (r'^accounts/', include('social.apps.django_app.urls', namespace='social')),
+    url(r'^accounts/', include('social.apps.django_app.urls', namespace='social')),
     url(r'^accounts/login/$',pf_login,{'template_name': 'registration/login.html'},name='auth_login'),
-    (r'^oauth/', include('oauth_provider.urls')),
+    url(r'^oauth/', include('oauth_provider.urls')),
     
-    #(r'^$', 'socialauth.views.signin_complete'),
-    #(r'^$', 'social_auth.views.complete'),
     
-    (r'^/?$', RedirectView.as_view(url='ldt')),
-    #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
+    url(r'^/?$', RedirectView.as_view(url='ldt')),
     
-    (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
-    (r'^hashcut/', include('hashcut.urls')),
-    (r'^composer/', include('metadatacomposer.urls')),
-)
+    url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
+    url(r'^hashcut/', include('hashcut.urls')),
+    url(r'^composer/', include('metadatacomposer.urls')),
+]
 
 urlpatterns += staticfiles_urlpatterns()
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file