diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index c9ab07a..18c0747 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -18,6 +18,10 @@
 
     </li>
     <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox %></li>
+
+    <li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li>
+
+
   </ul>
   <!-- <div class="alert">
     <h2>Beta Test</h2>
diff --git a/app/views/news_mailer/neuigkeit_mail.html.erb b/app/views/news_mailer/neuigkeit_mail.html.erb
index edd8017..8f85fcb 100644
--- a/app/views/news_mailer/neuigkeit_mail.html.erb
+++ b/app/views/news_mailer/neuigkeit_mail.html.erb
@@ -1,6 +1,6 @@
 <h1>
   <%=  @neuigkeit.title%>
 </h1>
-<%= image_tag "http://glonass.htu.tuwien.ac.at"+@neuigkeit.picture.big_thumb.url %>
+<%= image_tag "http://www.fet.at"+@neuigkeit.picture.big_thumb.url %>
 <%= raw(@neuigkeit.text) %>
-<%= link_to "Auf Fet.at weiterlesen", rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit,:locale=>:de, :theme=>nil,:host=> "glonass.htu.tuwien.ac.at") %> 
+<%= link_to "Auf Fet.at weiterlesen", rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit,:locale=>:de, :theme=>nil,:host=> "www.fet.at") %> 
diff --git a/app/views/themes/blue1/home/index.html.erb b/app/views/themes/blue1/home/index.html.erb
index c9ab07a..e38d309 100644
--- a/app/views/themes/blue1/home/index.html.erb
+++ b/app/views/themes/blue1/home/index.html.erb
@@ -18,6 +18,8 @@
 
     </li>
     <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox %></li>
+    <li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li>
+
   </ul>
   <!-- <div class="alert">
     <h2>Beta Test</h2>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e88835e..8f85baf 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -25,7 +25,7 @@ Fetsite::Application.configure do
 
   # Specifies the header that your server uses for sending files
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
@@ -42,11 +42,6 @@ Fetsite::Application.configure do
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-
-
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
@@ -54,8 +49,9 @@ Fetsite::Application.configure do
   # config.assets.precompile += %w( search.js  )
 
   # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.default_url_options={:host=>"glonass.htu.tuwien.ac.at"}
+  # config.action_mailer.raise_delivery_errors = false 
+  config.action_mailer.delivery_method =:sendmail
+  config.action_mailer.default_url_options={:host=>"www.fet.at"}
   # Enable threaded mode
   # config.threadsafe!
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index f6fcbac..af9af25 100755
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -4,11 +4,11 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "test@example.com"
+  config.mailer_sender = "no-reply@fet.at"
 
   # Configure the class responsible to send e-mails.
   config.mailer = "Devise::Mailer"
-  config.mailer.default_url_options = { :host => 'glonass.htu.tuwien.ac.at' }  
+  config.mailer.default_url_options = { :host => 'www.fet.at' }  
   config.mailer.delivery_method = :sendmail
 #  config.mailer.smtp_settings = {
 #  :address              => "smtp.gmail.com",
diff --git a/config/sunspot.yml b/config/sunspot.yml
index 0beaf96..cef12a4 100644
--- a/config/sunspot.yml
+++ b/config/sunspot.yml
@@ -1,9 +1,9 @@
 production:
   solr:
     hostname: localhost
-    port: 8983
+    port: 8080
     log_level: WARNING
-    path: /solr/default #production #ollection1 #production
+    path: /solr-4.10.2/default #production #ollection1 #production
 #    solr_home: solr
     # read_timeout: 2
     # open_timeout: 0.5
@@ -21,4 +21,4 @@ test:
     port: 8981
     log_level: WARNING
     path: /solr/test
-    
\ No newline at end of file
+    
diff --git a/public/robots.txt b/public/robots.txt
index 8e1d420..9dadc50 100755
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -2,4 +2,6 @@
 #
 # To ban all spiders from the entire site uncomment the next two lines:
 User-Agent: *
-Disallow: /
+Sitemap: http://www.fet.at/sitemap.xml.gz
+Disallow: /twiki/
+Disallow: /alt/