-from django.conf.urls.defaults import patterns, include, url
-from django.views.generic.simple import direct_to_template
+from django.conf.urls import patterns, include, url
from edition2.urls import urlpatterns as e2_urlpatterns
# from django.contrib import admin