Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting

Conflicts:
dynamicweb/settings.py
    Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
   Added railshosting url.

Signed-off-by: rscnt <rascnt@gmail.com>

dynamicweb/settings.py

@@ -83,6 +83,7 @@ INSTALLED_APPS = (
     'compressor',
     # ungleich
     'ungleich',
+    'railshosting',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -99,8 +100,8 @@ MIDDLEWARE_CLASSES = (
     'cms.middleware.page.CurrentPageMiddleware',
     'cms.middleware.toolbar.ToolbarMiddleware',
     'cms.middleware.language.LanguageCookieMiddleware',
-    # /djangocms-middlewares
 )
+#    'django.middleware.security.SecurityMiddleware',
 
 ROOT_URLCONF = 'dynamicweb.urls'
 
@@ -304,3 +305,8 @@ THUMBNAIL_PROCESSORS = (
 
 # django-cms-text-ckeditor
 TEXT_SAVE_IMAGE_FUNCTION='cmsplugin_filer_image.integrations.ckeditor.create_image_plugin'
+
+try:
+    from .local.local_settings import *
+except ImportError as e:
+    pass

dynamicweb/urls.py

@@ -1,7 +1,6 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 # deprecated in version 1.8
-from django.conf.urls.i18n import i18n_patterns
 from django.conf.urls.static import static
 from dynamicweb import settings
 
@@ -9,13 +8,16 @@ urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
     url(r'^digital.glarus/', include('digital_glarus.urls',
                                      namespace="digital_glarus")),
+    url(r'^railshosting/', include('railshosting.urls',
+                                   namespace="railshosting")),
     url(r'^', include('cms.urls')),
     url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if settings.DEBUG:
     urlpatterns += patterns('',
-                            url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
-                                'document_root': settings.MEDIA_ROOT,
-                            }),
-    )
+                            url(r'^media/(?P<path>.*)$',
+                                'django.views.static.serve', {
+                                    'document_root': settings.MEDIA_ROOT,
+                                }),
+                            )