Fixed broken login flow

dss/settings.py

@@ -151,7 +151,6 @@ INSTALLED_APPS = (
     'allauth.socialaccount.providers.linkedin',
     'allauth.socialaccount.providers.openid',
     'allauth.socialaccount.providers.twitter',
-    'emailconfirmation',
     'backbone_tastypie',
     )
 

dss/urls.py

@@ -18,11 +18,11 @@ urlpatterns = patterns('',
     (r'^tos\.html$', 'django.views.generic.simple.redirect_to', {'url': '/static/html/tos.html'}),
     (r'^test\.html$', 'django.views.generic.simple.redirect_to', {'url': '/static/html/test.html'}),
     (r'^500', 'django.views.defaults.server_error'),
-    url(r'^', include('spa.urls')),
     (r'^grappelli/', include('grappelli.urls')),
     url(r'^accounts/', include('allauth.urls')),
     (r'^avatar/', include('avatar.urls')),
     (r'^tinymce/', include('tinymce.urls')),
+    url(r'^', include('spa.urls')),
 )
 
 if settings.DEBUG:

spa/urls.py

@@ -26,7 +26,6 @@ social = SocialHandler()
 urlpatterns = django.conf.urls.patterns(
     '',
     url(r'^$', 'spa.views.app', name='home'),
-    url(r'^upload', 'spa.views.app', name='home'),
     url(r'^tpl/(?P<template_name>\w+)/$', 'spa.templates.get_template'),
     url(r'^js/(?P<template_name>\w+)/$', 'spa.templates.get_javascript'),
     url(r'^tplex/(?P<template_name>\w+)/$', 'spa.templates.get_template_ex'),