diff --git a/blechreiz/database.sqlite b/blechreiz/database.sqlite
index 5322a00..173f17e 100644
Binary files a/blechreiz/database.sqlite and b/blechreiz/database.sqlite differ
diff --git a/blechreiz/settings.py b/blechreiz/settings.py
index 9875c7f..d75a6a6 100644
--- a/blechreiz/settings.py
+++ b/blechreiz/settings.py
@@ -72,7 +72,7 @@ MEDIA_URL = '/media/'
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/var/www/example.com/static/"
-STATIC_ROOT = '/'
+STATIC_ROOT = PROJECT_PATH + '/static_collection'
 
 # URL prefix for static files.
 # Example: "http://example.com/static/", "http://static.example.com/"
@@ -159,9 +159,9 @@ INSTALLED_APPS = (
     'simpleforum',    # Messages ( Forum )
     'location_field', # custom location field used in Event Management 
     
-    'imagestore',
-    'sorl.thumbnail',
-    'tagging'
+    #'imagestore',
+    #'sorl.thumbnail',
+    #'tagging'
 )
 
 IMAGESTORE_TEMPLATE = "website/base.html" 
diff --git a/blechreiz/urls.py b/blechreiz/urls.py
index 03aabfd..fcfb313 100644
--- a/blechreiz/urls.py
+++ b/blechreiz/urls.py
@@ -6,7 +6,7 @@ import simpleforum.views
 
 import eventplanner.urls
 import musicians.urls
-import imagestore.urls
+#import imagestore.urls
 import website.urls
 
 
@@ -22,5 +22,5 @@ urlpatterns = patterns('',
     url(r'^messages/$',       simpleforum.views.message_view ),
     url(r'^admin/',           include(admin.site.urls) ),
     url(r'^location_field/',  include('location_field.urls')),
-    url(r'^gallery/',         include(imagestore.urls, namespace='imagestore') ),
-) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file
+    #url(r'^gallery/',         include(imagestore.urls, namespace='imagestore') ),
+) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/eventplanner/templates/eventplanner/events_grid.html b/eventplanner/templates/eventplanner/events_grid.html
index acaf670..8089b43 100644
--- a/eventplanner/templates/eventplanner/events_grid.html
+++ b/eventplanner/templates/eventplanner/events_grid.html
@@ -150,7 +150,7 @@
 						  {% for event in events %}
 						  	<tr class="eventRow">
 						  		<td class="center" > <a href="{{ event.pk }}" >  {{ event.title }}  </a> </td>
-						  		<td class="center infoColumn" > {{ event.location }}<br/> {{ event.date | date:"SHORT_DATE_FORMAT" }} </td>						  		
+						  		<td class="center infoColumn" > {% if event.location %}  {{ event.location }}<br/> {% endif %}  {{ event.date | date:"SHORT_DATE_FORMAT" }} </td>						  		
 								
 								
 								{% for p in event.participation %}
@@ -225,4 +225,4 @@
        </div>
    </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/simpleforum/templates/simpleforum/mail.txt b/simpleforum/templates/simpleforum/mail.txt
index 1a256c4..d614c79 100644
--- a/simpleforum/templates/simpleforum/mail.txt
+++ b/simpleforum/templates/simpleforum/mail.txt
@@ -5,5 +5,5 @@ Neuer Forumeintrag von  {{ messages.0.author.username }}:
 
 
 Im Forum antworten:
-	http://bauer1.selfip.com/blechreiz/messages
-	
\ No newline at end of file
+	http://bauer1.selfip.com/messages
+