Merge branch 'latest' of https://git.triton.fet.at/git/fetsite into latest

app/models/document.rb

@@ -24,7 +24,7 @@ class Document < ActiveRecord::Base
     "document_"+self.id.to_s
   end
   def self.ether
-    EtherpadLite.connect('http://www.fet.at/etherpad', File.new('/srv/etherpad/etherpad-lite/APIKEY.txt'))
+    EtherpadLite.connect('http://www.etherpad.fet.at', File.new('config/etherpad/APIKEY.txt'))
   end
   def create_pdf
       require "open3"