diff --git a/.gitignore b/.gitignore
index a56c92f..fc12e99 100755
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ console
 /server
 /public/uploads/
 /public/sitemap*
+/public/assets/
 /vendor/*
 /bak/*
 /solr/*
@@ -49,6 +50,9 @@ Gemfile.lock
 /config/database.yml
 /config/start_topic.yml
 /config/contact_topic.yml
+/config/etherpad/APIKEY.*
+/config/page.yml
+
 .#*
 .*
 !/.gitignore
diff --git a/app/models/document.rb b/app/models/document.rb
index ad4a713..bb772ea 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -72,16 +72,16 @@ class Document < ActiveRecord::Base
     unless self.is_etherpad?  || self.id.nil?
       self.etherpadkey="document_"+ self.id.to_s
 
-      if self.text.nill?
+      if self.text.nil?
         self.ep_pad.html = '<div>'+"text"+'</div>'
       else
         self.ep_pad.html = '<div>'+self.text+'</div>'
       end
-    end      
+    end
   end
   def dump_to_etherpad
     if self.is_etherpad?
-      if self.text.nill?
+      if self.text.nil?
         self.ep_pad.html = '<div>'+"text"+'</div>'
       else
         self.ep_pad.html = '<div>'+self.text+'</div>'
diff --git a/app/views/home/infoscreen.html.erb b/app/views/home/infoscreen.html.erb
index db57e0d..c223ef7 100644
--- a/app/views/home/infoscreen.html.erb
+++ b/app/views/home/infoscreen.html.erb
@@ -3,7 +3,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
     <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
-    <%= stylesheet_link_tag "infoscreenframe.css" %>
+    <%= stylesheet_link_tag "/iframe/infoscreenframe.css" %>
 
    <%= javascript_include_tag "application" %>
     <%= javascript_include_tag "jmpress" %>
diff --git a/config/sunspot.yml b/config/sunspot.yml
index 27023f3..745c27e 100644
--- a/config/sunspot.yml
+++ b/config/sunspot.yml
@@ -3,6 +3,8 @@ production:
     hostname: localhost
     port: 8080
     log_level: WARNING
+    min_memory: 32M 
+    max_memory: 1G
     path: /solr-4.10.2/default #production #ollection1 #production
 #    solr_home: solr
     # read_timeout: 2
@@ -14,6 +16,8 @@ development:
     port: 8080
     log_level: INFO
     path: /solr/mycore
+    min_memory: 32M
+    max_memory: 1G
 #  solr:
 #    hostname: localhost
 #    port: 8983