diff --git a/app/assets/javascripts/fetmeetings.js.coffee b/app/assets/javascripts/fetmeetings.js.coffee
deleted file mode 100644
index 7615679..0000000
--- a/app/assets/javascripts/fetmeetings.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/fetmeetingtops.js.coffee b/app/assets/javascripts/fetmeetingtops.js.coffee
deleted file mode 100644
index 7615679..0000000
--- a/app/assets/javascripts/fetmeetingtops.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/fetmeetings.css.scss b/app/assets/stylesheets/fetmeetings.css.scss
deleted file mode 100644
index a3a67e2..0000000
--- a/app/assets/stylesheets/fetmeetings.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the Fetmeetings controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/fetmeetingtops.css.scss b/app/assets/stylesheets/fetmeetingtops.css.scss
deleted file mode 100644
index 797bb09..0000000
--- a/app/assets/stylesheets/fetmeetingtops.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the Fetmeetingtops controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/themes/blue2/application.css.scss b/app/assets/stylesheets/themes/blue2/application.css.scss
index 5e9bf2e..773d11f 100755
--- a/app/assets/stylesheets/themes/blue2/application.css.scss
+++ b/app/assets/stylesheets/themes/blue2/application.css.scss
@@ -126,6 +126,6 @@ $box-background: white;
 
 @import 'extra';
 body {
-background: url('http://localhost:3000/stvn.jpg') fixed no-repeat;
+background: url('http://www.fet.at/stvn.jpg') fixed no-repeat;
 background-size:100%;
-}
\ No newline at end of file
+}
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index dce8233..ad55726 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -45,7 +45,6 @@ class DocumentsController < ApplicationController
     
     ether=Document.ether
     author = Document.ether.author("fetsite_"+current_user.uid, :name => current_user.text)
-author = Document.ether.author("author_1")
     session[:ep_sessions]={} if session[:ep_sessions].nil?
     group=@document.ep_group
 
@@ -58,9 +57,9 @@ author = Document.ether.author("author_1")
     session[:ep_sessions][group.id] = sess.id
     # Set the EtherpadLite session cookie. This will automatically be picked up by the jQuery plugin's iframe.
 
-    cookies[:sessionID] = {:value => sess.id, :domain => "www.fet.at"}
+    cookies[:sessionID] = {value: sess.id.to_s, domain: %w(.fet.at), expires: 1.hour.from_now}
     #cookies[:sessionID] = {:value => sess.id}
-    cookies[:sessionID1]=sess.id
+    cookies[:sessionID]= {value: sess.id, expires: 1.hour.from_now}
 #    cookies[:sdf]=sess.id
     # pad=ether.pad(@document.etherpadkey)
   #  redirect_to "http://www.fet.at/etherpad/p/"+@document.ep_pad.id
diff --git a/app/controllers/fetmeetings_controller.rb b/app/controllers/fetmeetings_controller.rb
deleted file mode 100644
index f265f3b..0000000
--- a/app/controllers/fetmeetings_controller.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-class FetmeetingsController < ApplicationController
-  # GET /fetmeetings
-  # GET /fetmeetings.json
-  def index
-    @fetmeetings = Fetmeeting.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @fetmeetings }
-    end
-  end
-
-  # GET /fetmeetings/1
-  # GET /fetmeetings/1.json
-  def show
-    @fetmeeting = Fetmeeting.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @fetmeeting }
-    end
-  end
-
-  # GET /fetmeetings/new
-  # GET /fetmeetings/new.json
-  def new
-    @fetmeeting = Fetmeeting.new
-    @fetmeeting.calentry=Calentry.new(typ: 0, object: @fetmeetings)
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @fetmeeting }
-    end
-  end
-
-  # GET /fetmeetings/1/edit
-  def edit
-    @fetmeeting = Fetmeeting.find(params[:id])
- 
-  end
-
-  # POST /fetmeetings
-  # POST /fetmeetings.json
-  def create
-    @fetmeeting = Fetmeeting.new(params[:fetmeeting])
-
-    respond_to do |format|
-      if @fetmeeting.save
-        format.html { redirect_to @fetmeeting, notice: 'Fetmeeting was successfully created.' }
-        format.json { render json: @fetmeeting, status: :created, location: @fetmeeting }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @fetmeeting.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /fetmeetings/1
-  # PUT /fetmeetings/1.json
-  def update
-    @fetmeeting = Fetmeeting.find(params[:id])
-
-    respond_to do |format|
-      if @fetmeeting.update_attributes(params[:fetmeeting])
-        format.html { redirect_to @fetmeeting, notice: 'Fetmeeting was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @fetmeeting.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /fetmeetings/1
-  # DELETE /fetmeetings/1.json
-  def destroy
-    @fetmeeting = Fetmeeting.find(params[:id])
-    @fetmeeting.destroy
-
-    respond_to do |format|
-      format.html { redirect_to fetmeetings_url }
-      format.json { head :no_content }
-    end
-  end
-end
diff --git a/app/controllers/fetmeetingtops_controller.rb b/app/controllers/fetmeetingtops_controller.rb
deleted file mode 100644
index 17083d1..0000000
--- a/app/controllers/fetmeetingtops_controller.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-class FetmeetingtopsController < ApplicationController
-  # GET /fetmeetingtops
-  # GET /fetmeetingtops.json
-  def index
-    @fetmeetingtops = Fetmeetingtop.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @fetmeetingtops }
-    end
-  end
-
-  # GET /fetmeetingtops/1
-  # GET /fetmeetingtops/1.json
-  def show
-    @fetmeetingtop = Fetmeetingtop.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @fetmeetingtop }
-    end
-  end
-
-  # GET /fetmeetingtops/new
-  # GET /fetmeetingtops/new.json
-  def new
-    @fetmeetingtop = Fetmeetingtop.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @fetmeetingtop }
-    end
-  end
-
-  # GET /fetmeetingtops/1/edit
-  def edit
-    @fetmeetingtop = Fetmeetingtop.find(params[:id])
-  end
-
-  # POST /fetmeetingtops
-  # POST /fetmeetingtops.json
-  def create
-    @fetmeetingtop = Fetmeetingtop.new(params[:fetmeetingtop])
-
-    respond_to do |format|
-      if @fetmeetingtop.save
-        format.html { redirect_to @fetmeetingtop, notice: 'Fetmeetingtop was successfully created.' }
-        format.json { render json: @fetmeetingtop, status: :created, location: @fetmeetingtop }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @fetmeetingtop.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /fetmeetingtops/1
-  # PUT /fetmeetingtops/1.json
-  def update
-    @fetmeetingtop = Fetmeetingtop.find(params[:id])
-
-    respond_to do |format|
-      if @fetmeetingtop.update_attributes(params[:fetmeetingtop])
-        format.html { redirect_to @fetmeetingtop, notice: 'Fetmeetingtop was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @fetmeetingtop.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /fetmeetingtops/1
-  # DELETE /fetmeetingtops/1.json
-  def destroy
-    @fetmeetingtop = Fetmeetingtop.find(params[:id])
-    @fetmeetingtop.destroy
-
-    respond_to do |format|
-      format.html { redirect_to fetmeetingtops_url }
-      format.json { head :no_content }
-    end
-  end
-end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index d965ec2..0410a28 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -37,7 +37,7 @@ class HomeController < ApplicationController
   def search
   
     unless params['query'].nil? || params['query'].empty?
-      @results = Sunspot.search Neuigkeit,Rubrik, Fetprofile, Thema, Themengruppe, Lva, Studium, Modul, Modulgruppe, Gremium do
+      @results = Sunspot.search Neuigkeit,Rubrik, Fetprofile, Thema, Themengruppe, Lva, Studium, Modul, Modulgruppe, Gremium, Document do
         fulltext params['query']
       end
       @neuigkeiten=[];
diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index 19491fc..05af5d3 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
+class NeuigkeitenController < ApplicationController
 
-	class NeuigkeitenController < ApplicationController
   before_filter :load_toolbar_elements, :only=>[:show,:find_link]
   before_filter :load_toolbar_elements_edit, :only=>[:edit]
  
diff --git a/app/helpers/fetmeetings_helper.rb b/app/helpers/fetmeetings_helper.rb
deleted file mode 100644
index 8317776..0000000
--- a/app/helpers/fetmeetings_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module FetmeetingsHelper
-end
diff --git a/app/helpers/fetmeetingtops_helper.rb b/app/helpers/fetmeetingtops_helper.rb
deleted file mode 100644
index f8abb5f..0000000
--- a/app/helpers/fetmeetingtops_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module FetmeetingtopsHelper
-end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index cb08fe9..ccee975 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -120,7 +120,7 @@ class Ability
     # Calendar
 
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
-      can [:edit, :update,:new,:create], Document
+      can [:show, :edit, :update,:new,:create,:write, :write_etherpad, :read_from_etherpad, :dump_to_etherpad], Document
       can :manage, Meeting
       can :manage, Meetingtyp
     end    
diff --git a/app/models/document.rb b/app/models/document.rb
index 40fa2db..7fff30a 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -9,6 +9,13 @@ class Document < ActiveRecord::Base
   validate :parent, :presence=>true
   has_paper_trail
   TYPS = { 1=>"fet_docs", 10=>"protocol", 11=> "agenda"}
+  def long_name 
+    if self.parent.class=="Meeting"
+      "<b>"+self.parent.text+ "</b>"+ self.name
+    else
+      "<b>" + self.parent.title + ":</b>"+ self.name
+    end
+  end
   def self.new_divid_for(parent)
     "document_new_parent_" + parent.class.to_s + "_" + parent.id.to_s 
   end
@@ -41,7 +48,7 @@ class Document < ActiveRecord::Base
     end
   end
   def read_from_etherpad
-    self.text=strip_control_chars(self.ep_pad.html)
+    self.text=ApplicationController.helpers.strip_control_chars(self.ep_pad.html)
  
   end
   def ep_pad
diff --git a/app/models/fetmeeting.rb b/app/models/fetmeeting.rb
deleted file mode 100644
index 152d2d8..0000000
--- a/app/models/fetmeeting.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Fetmeeting < ActiveRecord::Base
-  attr_accessible :tnlist, :typ, :calentry_attributes
-  has_many :fetmeetingtops
-  validates :typ, presence: true 
-  validates :calentry, presence: true	
-  has_one :calentry , as: :object 
-  accepts_nested_attributes_for :calentry
-  def public 
-    true
-  end		
-end
diff --git a/app/models/fetmeetingtop.rb b/app/models/fetmeetingtop.rb
deleted file mode 100644
index c687d25..0000000
--- a/app/models/fetmeetingtop.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Fetmeetingtop < ActiveRecord::Base
-  attr_accessible :discussion, :ersteller, :fetmeeting_id, :text, :title
-  belongs_to :fetmeeting
-  validates :fetmeeting, presence: true 
-  validates :title, presence: true , length:{minimum: 4}
-  validates :ersteller, presence: true
-end
diff --git a/app/views/documents/_nlink.html.erb b/app/views/documents/_nlink.html.erb
new file mode 100644
index 0000000..5f0ae52
--- /dev/null
+++ b/app/views/documents/_nlink.html.erb
@@ -0,0 +1,2 @@
+<%= raw(nlink.long_name) %>
+
diff --git a/app/views/fetmeetings/_form.html.erb b/app/views/fetmeetings/_form.html.erb
deleted file mode 100644
index c1c31bd..0000000
--- a/app/views/fetmeetings/_form.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= semantic_form_for @fetmeeting do |f| %>
-  <%= f.inputs do %>
-    <%= f.input :tnlist %>
-    <%= f.input :typ %>
-	 <%= f.semantic_fields_for :calentry , @fetmeeting.calentry do |calentry| %>
-      <%= render 'calentries/nested_fields', :f => calentry %> 
-      <% end %>
-   
-  <% end %>
-
-  <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
-  <% end %>
-<% end %>
diff --git a/app/views/fetmeetings/edit.html.erb b/app/views/fetmeetings/edit.html.erb
deleted file mode 100644
index 01aa711..0000000
--- a/app/views/fetmeetings/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing fetmeeting</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @fetmeeting %> |
-<%= link_to 'Back', fetmeetings_path %>
diff --git a/app/views/fetmeetings/index.html.erb b/app/views/fetmeetings/index.html.erb
deleted file mode 100644
index 28c259d..0000000
--- a/app/views/fetmeetings/index.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<h1>Listing fetmeetings</h1>
-
-<table>
-  <tr>
-    <th>Tnlist</th>
-    <th>Typ</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @fetmeetings.each do |fetmeeting| %>
-  <tr>
-    <td><%= fetmeeting.tnlist %></td>
-    <td><%= fetmeeting.typ %></td>
-    <td><%= link_to 'Show', fetmeeting %></td>
-    <td><%= link_to 'Edit', edit_fetmeeting_path(fetmeeting) %></td>
-    <td><%= link_to 'Destroy', fetmeeting, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New Fetmeeting', new_fetmeeting_path %>
diff --git a/app/views/fetmeetings/new.html.erb b/app/views/fetmeetings/new.html.erb
deleted file mode 100644
index ab0d5ea..0000000
--- a/app/views/fetmeetings/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New fetmeeting</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', fetmeetings_path %>
diff --git a/app/views/fetmeetings/show.html.erb b/app/views/fetmeetings/show.html.erb
deleted file mode 100644
index 914785d..0000000
--- a/app/views/fetmeetings/show.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <b>Tnlist:</b>
-  <%= @fetmeeting.tnlist %>
-</p>
-
-<p>
-  <b>Typ:</b>
-  <%= @fetmeeting.typ %>
-</p>
-<p>
-<ul>
-<% @fetmeeting.fetmeetingtops.each do |top|%>
-<li><%= render top %></li>
-<% end %>
-</ul>
-</p>
-<%= link_to 'Edit', edit_fetmeeting_path(@fetmeeting) %> |
-<%= link_to 'Back', fetmeetings_path %>
diff --git a/app/views/fetmeetingtops/_fetmeetingtop.html.erb b/app/views/fetmeetingtops/_fetmeetingtop.html.erb
deleted file mode 100644
index f697269..0000000
--- a/app/views/fetmeetingtops/_fetmeetingtop.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= fetmeetingtop.title %> (<i><%= fetmeetingtop.ersteller %></i>)
diff --git a/app/views/fetmeetingtops/_form.html.erb b/app/views/fetmeetingtops/_form.html.erb
deleted file mode 100644
index 23dd082..0000000
--- a/app/views/fetmeetingtops/_form.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= semantic_form_for @fetmeetingtop do |f| %>
-  <%= f.inputs do %>
-    <%= f.input :title %>
-    <%= f.input :text %>
-    <%= f.input :discussion , as: :tinymce_text %>
-    <%= f.input :ersteller %>
-    <%= f.input :fetmeeting_id %>
-  <% end %>
-
-  <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
-  <% end %>
-<% end %>
-<%= tinymce %>
diff --git a/app/views/fetmeetingtops/edit.html.erb b/app/views/fetmeetingtops/edit.html.erb
deleted file mode 100644
index a05d980..0000000
--- a/app/views/fetmeetingtops/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing fetmeetingtop</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @fetmeetingtop %> |
-<%= link_to 'Back', fetmeetingtops_path %>
diff --git a/app/views/fetmeetingtops/index.html.erb b/app/views/fetmeetingtops/index.html.erb
deleted file mode 100644
index 0292dd2..0000000
--- a/app/views/fetmeetingtops/index.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1>Listing fetmeetingtops</h1>
-
-<table>
-  <tr>
-    <th>Title</th>
-    <th>Text</th>
-    <th>Discussion</th>
-    <th>Ersteller</th>
-    <th>Fetmeeting</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @fetmeetingtops.each do |fetmeetingtop| %>
-  <tr>
-    <td><%= fetmeetingtop.title %></td>
-    <td><%= fetmeetingtop.text %></td>
-    <td><%= fetmeetingtop.discussion %></td>
-    <td><%= fetmeetingtop.ersteller %></td>
-    <td><%= fetmeetingtop.fetmeeting_id %></td>
-    <td><%= link_to 'Show', fetmeetingtop %></td>
-    <td><%= link_to 'Edit', edit_fetmeetingtop_path(fetmeetingtop) %></td>
-    <td><%= link_to 'Destroy', fetmeetingtop, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New Fetmeetingtop', new_fetmeetingtop_path %>
diff --git a/app/views/fetmeetingtops/new.html.erb b/app/views/fetmeetingtops/new.html.erb
deleted file mode 100644
index 96198c4..0000000
--- a/app/views/fetmeetingtops/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New fetmeetingtop</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', fetmeetingtops_path %>
diff --git a/app/views/fetmeetingtops/show.html.erb b/app/views/fetmeetingtops/show.html.erb
deleted file mode 100644
index 739bf08..0000000
--- a/app/views/fetmeetingtops/show.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <b>Title:</b>
-  <%= @fetmeetingtop.title %>
-</p>
-
-<p>
-  <b>Text:</b>
-  <%= @fetmeetingtop.text %>
-</p>
-
-<p>
-  <b>Discussion:</b>
-  <%= @fetmeetingtop.discussion %>
-</p>
-
-<p>
-  <b>Ersteller:</b>
-  <%= @fetmeetingtop.ersteller %>
-</p>
-
-<p>
-  <b>Fetmeeting:</b>
-  <%= @fetmeetingtop.fetmeeting_id %>
-</p>
-
-
-<%= link_to 'Edit', edit_fetmeetingtop_path(@fetmeetingtop) %> |
-<%= link_to 'Back', fetmeetingtops_path %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a299454..cd61ce0 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -25,7 +25,7 @@ de:
     willkommen: "Willkommen bei der Fachschaft Elektrotechnik"
     hallobeiderfet: "auf der Seite der Fachschaft Elektrotechnik an der TU Wien. Wir sind die offizielle Vertretung aller Studierenden Auf der Fakultät für Elektrotechnik und Informationstechnik. Wir vertreten eure Interessen in den offiziellen Gremien der Universität. Wir sind bemüht euch in Anliegen des Studiums bestmöglich zu unterstützen und beraten. Außerdem bieten wir ein Rahmenprogramm zum Studium in Form von Veranstaltungen und Festln. Wir freuen uns über Feedback und Anregungen, insbesondere von jenen, die gleich Nägel mit Köpfen machen und unser Team verstärken wollen oder ihre Themen und Meinungen in eine unserer Sitzungen einbringen möchten."
     home: "Startseite"
-    studien: "Studien"
+    studien: "Studien/Beispielsammlung"
     news: "Neuigkeiten"
     info: "Information"
     mitarbeiter: "Mitarbeiter"
@@ -45,4 +45,4 @@ de:
     service_text: "Für individuelle Beratung und alle sonstigen Angelegenheiten stehen wir mit unserem Servicedienst während der Vorlesungszeit jenen <b>Mo-Fr von 9 bis 15 Uhr</b> zur Verfügung. Außerhalb dieser Zeiten ist oft trotzdem jemand auf der Fachschaft der dir weiterhelfen kann."
     telefon_text: "Telefon: +43 2241341 <br> Skype: <br><b>E-Mail: service@fet.at</b>"
   search:
-    no_results_for: "Es wurden keine Einträge gefunden für"
\ No newline at end of file
+    no_results_for: "Es wurden keine Einträge gefunden für"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2324a9c..03d0746 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -17,7 +17,7 @@ en:
     willkommen: "Welcome at Fachschaft Elektrotechnik" 
     hallobeiderfet: "This is the page of Fachschaft Elektrotechnik at TU Wien"
     home: "Home"
-    studien: "Studies"
+    studien: "Studies/Collection of Examples"
     news: "News"
     info: "Information"
     mitarbeiter: "Members"
diff --git a/config/routes.rb b/config/routes.rb
index 401bb77..0273519 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,11 +1,5 @@
 
  Fetsite::Application.routes.draw do
-  resources :fetmeetingtops
-
-
-  resources :fetmeetings
-
-
   themes_for_rails
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
   resources :home, :only=>[:index] do
diff --git a/db/migrate/20140507125633_create_fetmeetings.rb b/db/migrate/20140507125633_create_fetmeetings.rb
deleted file mode 100644
index cea9fef..0000000
--- a/db/migrate/20140507125633_create_fetmeetings.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateFetmeetings < ActiveRecord::Migration
-  def change
-    create_table :fetmeetings do |t|
-      t.text :tnlist
-      t.integer :typ
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140507130354_create_fetmeetingtops.rb b/db/migrate/20140507130354_create_fetmeetingtops.rb
deleted file mode 100644
index 810e5ce..0000000
--- a/db/migrate/20140507130354_create_fetmeetingtops.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateFetmeetingtops < ActiveRecord::Migration
-  def change
-    create_table :fetmeetingtops do |t|
-      t.string :title
-      t.text :text
-      t.text :discussion
-      t.string :ersteller
-      t.integer :fetmeeting_id
-
-      t.timestamps
-    end
-  end
-end
diff --git a/spec/controllers/fetmeetings_controller_spec.rb b/spec/controllers/fetmeetings_controller_spec.rb
deleted file mode 100644
index 2467093..0000000
--- a/spec/controllers/fetmeetings_controller_spec.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-require 'spec_helper'
-
-# This spec was generated by rspec-rails when you ran the scaffold generator.
-# It demonstrates how one might use RSpec to specify the controller code that
-# was generated by Rails when you ran the scaffold generator.
-#
-# It assumes that the implementation code is generated by the rails scaffold
-# generator.  If you are using any extension libraries to generate different
-# controller code, this generated spec may or may not pass.
-#
-# It only uses APIs available in rails and/or rspec-rails.  There are a number
-# of tools you can use to make these specs even more expressive, but we're
-# sticking to rails and rspec-rails APIs to keep things simple and stable.
-#
-# Compared to earlier versions of this generator, there is very limited use of
-# stubs and message expectations in this spec.  Stubs are only used when there
-# is no simpler way to get a handle on the object needed for the example.
-# Message expectations are only used when there is no simpler way to specify
-# that an instance is receiving a specific message.
-
-describe FetmeetingsController do
-
-  # This should return the minimal set of attributes required to create a valid
-  # Fetmeeting. As you add validations to Fetmeeting, be sure to
-  # adjust the attributes here as well.
-  let(:valid_attributes) { { "tnlist" => "MyText" } }
-
-  # This should return the minimal set of values that should be in the session
-  # in order to pass any filters (e.g. authentication) defined in
-  # FetmeetingsController. Be sure to keep this updated too.
-  let(:valid_session) { {} }
-
-  describe "GET index" do
-    it "assigns all fetmeetings as @fetmeetings" do
-      fetmeeting = Fetmeeting.create! valid_attributes
-      get :index, {}, valid_session
-      assigns(:fetmeetings).should eq([fetmeeting])
-    end
-  end
-
-  describe "GET show" do
-    it "assigns the requested fetmeeting as @fetmeeting" do
-      fetmeeting = Fetmeeting.create! valid_attributes
-      get :show, {:id => fetmeeting.to_param}, valid_session
-      assigns(:fetmeeting).should eq(fetmeeting)
-    end
-  end
-
-  describe "GET new" do
-    it "assigns a new fetmeeting as @fetmeeting" do
-      get :new, {}, valid_session
-      assigns(:fetmeeting).should be_a_new(Fetmeeting)
-    end
-  end
-
-  describe "GET edit" do
-    it "assigns the requested fetmeeting as @fetmeeting" do
-      fetmeeting = Fetmeeting.create! valid_attributes
-      get :edit, {:id => fetmeeting.to_param}, valid_session
-      assigns(:fetmeeting).should eq(fetmeeting)
-    end
-  end
-
-  describe "POST create" do
-    describe "with valid params" do
-      it "creates a new Fetmeeting" do
-        expect {
-          post :create, {:fetmeeting => valid_attributes}, valid_session
-        }.to change(Fetmeeting, :count).by(1)
-      end
-
-      it "assigns a newly created fetmeeting as @fetmeeting" do
-        post :create, {:fetmeeting => valid_attributes}, valid_session
-        assigns(:fetmeeting).should be_a(Fetmeeting)
-        assigns(:fetmeeting).should be_persisted
-      end
-
-      it "redirects to the created fetmeeting" do
-        post :create, {:fetmeeting => valid_attributes}, valid_session
-        response.should redirect_to(Fetmeeting.last)
-      end
-    end
-
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved fetmeeting as @fetmeeting" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetmeeting.any_instance.stub(:save).and_return(false)
-        post :create, {:fetmeeting => { "tnlist" => "invalid value" }}, valid_session
-        assigns(:fetmeeting).should be_a_new(Fetmeeting)
-      end
-
-      it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetmeeting.any_instance.stub(:save).and_return(false)
-        post :create, {:fetmeeting => { "tnlist" => "invalid value" }}, valid_session
-        response.should render_template("new")
-      end
-    end
-  end
-
-  describe "PUT update" do
-    describe "with valid params" do
-      it "updates the requested fetmeeting" do
-        fetmeeting = Fetmeeting.create! valid_attributes
-        # Assuming there are no other fetmeetings in the database, this
-        # specifies that the Fetmeeting created on the previous line
-        # receives the :update_attributes message with whatever params are
-        # submitted in the request.
-        Fetmeeting.any_instance.should_receive(:update_attributes).with({ "tnlist" => "MyText" })
-        put :update, {:id => fetmeeting.to_param, :fetmeeting => { "tnlist" => "MyText" }}, valid_session
-      end
-
-      it "assigns the requested fetmeeting as @fetmeeting" do
-        fetmeeting = Fetmeeting.create! valid_attributes
-        put :update, {:id => fetmeeting.to_param, :fetmeeting => valid_attributes}, valid_session
-        assigns(:fetmeeting).should eq(fetmeeting)
-      end
-
-      it "redirects to the fetmeeting" do
-        fetmeeting = Fetmeeting.create! valid_attributes
-        put :update, {:id => fetmeeting.to_param, :fetmeeting => valid_attributes}, valid_session
-        response.should redirect_to(fetmeeting)
-      end
-    end
-
-    describe "with invalid params" do
-      it "assigns the fetmeeting as @fetmeeting" do
-        fetmeeting = Fetmeeting.create! valid_attributes
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetmeeting.any_instance.stub(:save).and_return(false)
-        put :update, {:id => fetmeeting.to_param, :fetmeeting => { "tnlist" => "invalid value" }}, valid_session
-        assigns(:fetmeeting).should eq(fetmeeting)
-      end
-
-      it "re-renders the 'edit' template" do
-        fetmeeting = Fetmeeting.create! valid_attributes
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetmeeting.any_instance.stub(:save).and_return(false)
-        put :update, {:id => fetmeeting.to_param, :fetmeeting => { "tnlist" => "invalid value" }}, valid_session
-        response.should render_template("edit")
-      end
-    end
-  end
-
-  describe "DELETE destroy" do
-    it "destroys the requested fetmeeting" do
-      fetmeeting = Fetmeeting.create! valid_attributes
-      expect {
-        delete :destroy, {:id => fetmeeting.to_param}, valid_session
-      }.to change(Fetmeeting, :count).by(-1)
-    end
-
-    it "redirects to the fetmeetings list" do
-      fetmeeting = Fetmeeting.create! valid_attributes
-      delete :destroy, {:id => fetmeeting.to_param}, valid_session
-      response.should redirect_to(fetmeetings_url)
-    end
-  end
-
-end
diff --git a/spec/controllers/fetmeetingtops_controller_spec.rb b/spec/controllers/fetmeetingtops_controller_spec.rb
deleted file mode 100644
index 7c4a70d..0000000
--- a/spec/controllers/fetmeetingtops_controller_spec.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-require 'spec_helper'
-
-# This spec was generated by rspec-rails when you ran the scaffold generator.
-# It demonstrates how one might use RSpec to specify the controller code that
-# was generated by Rails when you ran the scaffold generator.
-#
-# It assumes that the implementation code is generated by the rails scaffold
-# generator.  If you are using any extension libraries to generate different
-# controller code, this generated spec may or may not pass.
-#
-# It only uses APIs available in rails and/or rspec-rails.  There are a number
-# of tools you can use to make these specs even more expressive, but we're
-# sticking to rails and rspec-rails APIs to keep things simple and stable.
-#
-# Compared to earlier versions of this generator, there is very limited use of
-# stubs and message expectations in this spec.  Stubs are only used when there
-# is no simpler way to get a handle on the object needed for the example.
-# Message expectations are only used when there is no simpler way to specify
-# that an instance is receiving a specific message.
-
-describe FetmeetingtopsController do
-
-  # This should return the minimal set of attributes required to create a valid
-  # Fetmeetingtop. As you add validations to Fetmeetingtop, be sure to
-  # adjust the attributes here as well.
-  let(:valid_attributes) { { "title" => "MyString" } }
-
-  # This should return the minimal set of values that should be in the session
-  # in order to pass any filters (e.g. authentication) defined in
-  # FetmeetingtopsController. Be sure to keep this updated too.
-  let(:valid_session) { {} }
-
-  describe "GET index" do
-    it "assigns all fetmeetingtops as @fetmeetingtops" do
-      fetmeetingtop = Fetmeetingtop.create! valid_attributes
-      get :index, {}, valid_session
-      assigns(:fetmeetingtops).should eq([fetmeetingtop])
-    end
-  end
-
-  describe "GET show" do
-    it "assigns the requested fetmeetingtop as @fetmeetingtop" do
-      fetmeetingtop = Fetmeetingtop.create! valid_attributes
-      get :show, {:id => fetmeetingtop.to_param}, valid_session
-      assigns(:fetmeetingtop).should eq(fetmeetingtop)
-    end
-  end
-
-  describe "GET new" do
-    it "assigns a new fetmeetingtop as @fetmeetingtop" do
-      get :new, {}, valid_session
-      assigns(:fetmeetingtop).should be_a_new(Fetmeetingtop)
-    end
-  end
-
-  describe "GET edit" do
-    it "assigns the requested fetmeetingtop as @fetmeetingtop" do
-      fetmeetingtop = Fetmeetingtop.create! valid_attributes
-      get :edit, {:id => fetmeetingtop.to_param}, valid_session
-      assigns(:fetmeetingtop).should eq(fetmeetingtop)
-    end
-  end
-
-  describe "POST create" do
-    describe "with valid params" do
-      it "creates a new Fetmeetingtop" do
-        expect {
-          post :create, {:fetmeetingtop => valid_attributes}, valid_session
-        }.to change(Fetmeetingtop, :count).by(1)
-      end
-
-      it "assigns a newly created fetmeetingtop as @fetmeetingtop" do
-        post :create, {:fetmeetingtop => valid_attributes}, valid_session
-        assigns(:fetmeetingtop).should be_a(Fetmeetingtop)
-        assigns(:fetmeetingtop).should be_persisted
-      end
-
-      it "redirects to the created fetmeetingtop" do
-        post :create, {:fetmeetingtop => valid_attributes}, valid_session
-        response.should redirect_to(Fetmeetingtop.last)
-      end
-    end
-
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved fetmeetingtop as @fetmeetingtop" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetmeetingtop.any_instance.stub(:save).and_return(false)
-        post :create, {:fetmeetingtop => { "title" => "invalid value" }}, valid_session
-        assigns(:fetmeetingtop).should be_a_new(Fetmeetingtop)
-      end
-
-      it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetmeetingtop.any_instance.stub(:save).and_return(false)
-        post :create, {:fetmeetingtop => { "title" => "invalid value" }}, valid_session
-        response.should render_template("new")
-      end
-    end
-  end
-
-  describe "PUT update" do
-    describe "with valid params" do
-      it "updates the requested fetmeetingtop" do
-        fetmeetingtop = Fetmeetingtop.create! valid_attributes
-        # Assuming there are no other fetmeetingtops in the database, this
-        # specifies that the Fetmeetingtop created on the previous line
-        # receives the :update_attributes message with whatever params are
-        # submitted in the request.
-        Fetmeetingtop.any_instance.should_receive(:update_attributes).with({ "title" => "MyString" })
-        put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => { "title" => "MyString" }}, valid_session
-      end
-
-      it "assigns the requested fetmeetingtop as @fetmeetingtop" do
-        fetmeetingtop = Fetmeetingtop.create! valid_attributes
-        put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => valid_attributes}, valid_session
-        assigns(:fetmeetingtop).should eq(fetmeetingtop)
-      end
-
-      it "redirects to the fetmeetingtop" do
-        fetmeetingtop = Fetmeetingtop.create! valid_attributes
-        put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => valid_attributes}, valid_session
-        response.should redirect_to(fetmeetingtop)
-      end
-    end
-
-    describe "with invalid params" do
-      it "assigns the fetmeetingtop as @fetmeetingtop" do
-        fetmeetingtop = Fetmeetingtop.create! valid_attributes
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetmeetingtop.any_instance.stub(:save).and_return(false)
-        put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => { "title" => "invalid value" }}, valid_session
-        assigns(:fetmeetingtop).should eq(fetmeetingtop)
-      end
-
-      it "re-renders the 'edit' template" do
-        fetmeetingtop = Fetmeetingtop.create! valid_attributes
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetmeetingtop.any_instance.stub(:save).and_return(false)
-        put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => { "title" => "invalid value" }}, valid_session
-        response.should render_template("edit")
-      end
-    end
-  end
-
-  describe "DELETE destroy" do
-    it "destroys the requested fetmeetingtop" do
-      fetmeetingtop = Fetmeetingtop.create! valid_attributes
-      expect {
-        delete :destroy, {:id => fetmeetingtop.to_param}, valid_session
-      }.to change(Fetmeetingtop, :count).by(-1)
-    end
-
-    it "redirects to the fetmeetingtops list" do
-      fetmeetingtop = Fetmeetingtop.create! valid_attributes
-      delete :destroy, {:id => fetmeetingtop.to_param}, valid_session
-      response.should redirect_to(fetmeetingtops_url)
-    end
-  end
-
-end
diff --git a/spec/factories/fetmeetings.rb b/spec/factories/fetmeetings.rb
deleted file mode 100644
index 8cf06b7..0000000
--- a/spec/factories/fetmeetings.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :fetmeeting do
-    tnlist "MyText"
-    typ 1
-  end
-end
diff --git a/spec/factories/fetmeetingtops.rb b/spec/factories/fetmeetingtops.rb
deleted file mode 100644
index 1443519..0000000
--- a/spec/factories/fetmeetingtops.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :fetmeetingtop do
-    title "MyString"
-    text "MyText"
-    discussion "MyText"
-    ersteller "MyString"
-    fetmeeting_id 1
-  end
-end
diff --git a/spec/helpers/fetmeetings_helper_spec.rb b/spec/helpers/fetmeetings_helper_spec.rb
deleted file mode 100644
index ca81428..0000000
--- a/spec/helpers/fetmeetings_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the FetmeetingsHelper. For example:
-#
-# describe FetmeetingsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       expect(helper.concat_strings("this","that")).to eq("this that")
-#     end
-#   end
-# end
-describe FetmeetingsHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/helpers/fetmeetingtops_helper_spec.rb b/spec/helpers/fetmeetingtops_helper_spec.rb
deleted file mode 100644
index 1304fcd..0000000
--- a/spec/helpers/fetmeetingtops_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the FetmeetingtopsHelper. For example:
-#
-# describe FetmeetingtopsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       expect(helper.concat_strings("this","that")).to eq("this that")
-#     end
-#   end
-# end
-describe FetmeetingtopsHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/fetmeeting_spec.rb b/spec/models/fetmeeting_spec.rb
deleted file mode 100644
index f809f99..0000000
--- a/spec/models/fetmeeting_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Fetmeeting do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/fetmeetingtop_spec.rb b/spec/models/fetmeetingtop_spec.rb
deleted file mode 100644
index e508e83..0000000
--- a/spec/models/fetmeetingtop_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Fetmeetingtop do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/requests/fetmeetings_spec.rb b/spec/requests/fetmeetings_spec.rb
deleted file mode 100644
index 0444c6d..0000000
--- a/spec/requests/fetmeetings_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe "Fetmeetings" do
-  describe "GET /fetmeetings" do
-    it "works! (now write some real specs)" do
-      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
-      get fetmeetings_path
-      response.status.should be(200)
-    end
-  end
-end
diff --git a/spec/requests/fetmeetingtops_spec.rb b/spec/requests/fetmeetingtops_spec.rb
deleted file mode 100644
index 7273cc6..0000000
--- a/spec/requests/fetmeetingtops_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe "Fetmeetingtops" do
-  describe "GET /fetmeetingtops" do
-    it "works! (now write some real specs)" do
-      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
-      get fetmeetingtops_path
-      response.status.should be(200)
-    end
-  end
-end
diff --git a/spec/routing/fetmeetings_routing_spec.rb b/spec/routing/fetmeetings_routing_spec.rb
deleted file mode 100644
index 77d71e6..0000000
--- a/spec/routing/fetmeetings_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe FetmeetingsController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/fetmeetings").should route_to("fetmeetings#index")
-    end
-
-    it "routes to #new" do
-      get("/fetmeetings/new").should route_to("fetmeetings#new")
-    end
-
-    it "routes to #show" do
-      get("/fetmeetings/1").should route_to("fetmeetings#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/fetmeetings/1/edit").should route_to("fetmeetings#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/fetmeetings").should route_to("fetmeetings#create")
-    end
-
-    it "routes to #update" do
-      put("/fetmeetings/1").should route_to("fetmeetings#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/fetmeetings/1").should route_to("fetmeetings#destroy", :id => "1")
-    end
-
-  end
-end
diff --git a/spec/routing/fetmeetingtops_routing_spec.rb b/spec/routing/fetmeetingtops_routing_spec.rb
deleted file mode 100644
index c937eee..0000000
--- a/spec/routing/fetmeetingtops_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe FetmeetingtopsController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/fetmeetingtops").should route_to("fetmeetingtops#index")
-    end
-
-    it "routes to #new" do
-      get("/fetmeetingtops/new").should route_to("fetmeetingtops#new")
-    end
-
-    it "routes to #show" do
-      get("/fetmeetingtops/1").should route_to("fetmeetingtops#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/fetmeetingtops/1/edit").should route_to("fetmeetingtops#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/fetmeetingtops").should route_to("fetmeetingtops#create")
-    end
-
-    it "routes to #update" do
-      put("/fetmeetingtops/1").should route_to("fetmeetingtops#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/fetmeetingtops/1").should route_to("fetmeetingtops#destroy", :id => "1")
-    end
-
-  end
-end
diff --git a/spec/views/fetmeetings/edit.html.erb_spec.rb b/spec/views/fetmeetings/edit.html.erb_spec.rb
deleted file mode 100644
index 5c565e6..0000000
--- a/spec/views/fetmeetings/edit.html.erb_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe "fetmeetings/edit" do
-  before(:each) do
-    @fetmeeting = assign(:fetmeeting, stub_model(Fetmeeting,
-      :tnlist => "MyText",
-      :typ => 1
-    ))
-  end
-
-  it "renders the edit fetmeeting form" do
-    render
-
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", fetmeeting_path(@fetmeeting), "post" do
-      assert_select "textarea#fetmeeting_tnlist[name=?]", "fetmeeting[tnlist]"
-      assert_select "input#fetmeeting_typ[name=?]", "fetmeeting[typ]"
-    end
-  end
-end
diff --git a/spec/views/fetmeetings/index.html.erb_spec.rb b/spec/views/fetmeetings/index.html.erb_spec.rb
deleted file mode 100644
index 96c6ac8..0000000
--- a/spec/views/fetmeetings/index.html.erb_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "fetmeetings/index" do
-  before(:each) do
-    assign(:fetmeetings, [
-      stub_model(Fetmeeting,
-        :tnlist => "MyText",
-        :typ => 1
-      ),
-      stub_model(Fetmeeting,
-        :tnlist => "MyText",
-        :typ => 1
-      )
-    ])
-  end
-
-  it "renders a list of fetmeetings" do
-    render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "tr>td", :text => "MyText".to_s, :count => 2
-    assert_select "tr>td", :text => 1.to_s, :count => 2
-  end
-end
diff --git a/spec/views/fetmeetings/new.html.erb_spec.rb b/spec/views/fetmeetings/new.html.erb_spec.rb
deleted file mode 100644
index 4773b40..0000000
--- a/spec/views/fetmeetings/new.html.erb_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe "fetmeetings/new" do
-  before(:each) do
-    assign(:fetmeeting, stub_model(Fetmeeting,
-      :tnlist => "MyText",
-      :typ => 1
-    ).as_new_record)
-  end
-
-  it "renders new fetmeeting form" do
-    render
-
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", fetmeetings_path, "post" do
-      assert_select "textarea#fetmeeting_tnlist[name=?]", "fetmeeting[tnlist]"
-      assert_select "input#fetmeeting_typ[name=?]", "fetmeeting[typ]"
-    end
-  end
-end
diff --git a/spec/views/fetmeetings/show.html.erb_spec.rb b/spec/views/fetmeetings/show.html.erb_spec.rb
deleted file mode 100644
index 4e54a71..0000000
--- a/spec/views/fetmeetings/show.html.erb_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe "fetmeetings/show" do
-  before(:each) do
-    @fetmeeting = assign(:fetmeeting, stub_model(Fetmeeting,
-      :tnlist => "MyText",
-      :typ => 1
-    ))
-  end
-
-  it "renders attributes in <p>" do
-    render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should match(/MyText/)
-    rendered.should match(/1/)
-  end
-end
diff --git a/spec/views/fetmeetingtops/edit.html.erb_spec.rb b/spec/views/fetmeetingtops/edit.html.erb_spec.rb
deleted file mode 100644
index 11b3899..0000000
--- a/spec/views/fetmeetingtops/edit.html.erb_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe "fetmeetingtops/edit" do
-  before(:each) do
-    @fetmeetingtop = assign(:fetmeetingtop, stub_model(Fetmeetingtop,
-      :title => "MyString",
-      :text => "MyText",
-      :discussion => "MyText",
-      :ersteller => "MyString",
-      :fetmeeting_id => 1
-    ))
-  end
-
-  it "renders the edit fetmeetingtop form" do
-    render
-
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", fetmeetingtop_path(@fetmeetingtop), "post" do
-      assert_select "input#fetmeetingtop_title[name=?]", "fetmeetingtop[title]"
-      assert_select "textarea#fetmeetingtop_text[name=?]", "fetmeetingtop[text]"
-      assert_select "textarea#fetmeetingtop_discussion[name=?]", "fetmeetingtop[discussion]"
-      assert_select "input#fetmeetingtop_ersteller[name=?]", "fetmeetingtop[ersteller]"
-      assert_select "input#fetmeetingtop_fetmeeting_id[name=?]", "fetmeetingtop[fetmeeting_id]"
-    end
-  end
-end
diff --git a/spec/views/fetmeetingtops/index.html.erb_spec.rb b/spec/views/fetmeetingtops/index.html.erb_spec.rb
deleted file mode 100644
index 8935c13..0000000
--- a/spec/views/fetmeetingtops/index.html.erb_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe "fetmeetingtops/index" do
-  before(:each) do
-    assign(:fetmeetingtops, [
-      stub_model(Fetmeetingtop,
-        :title => "Title",
-        :text => "MyText",
-        :discussion => "MyText",
-        :ersteller => "Ersteller",
-        :fetmeeting_id => 1
-      ),
-      stub_model(Fetmeetingtop,
-        :title => "Title",
-        :text => "MyText",
-        :discussion => "MyText",
-        :ersteller => "Ersteller",
-        :fetmeeting_id => 1
-      )
-    ])
-  end
-
-  it "renders a list of fetmeetingtops" do
-    render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "tr>td", :text => "Title".to_s, :count => 2
-    assert_select "tr>td", :text => "MyText".to_s, :count => 2
-    assert_select "tr>td", :text => "MyText".to_s, :count => 2
-    assert_select "tr>td", :text => "Ersteller".to_s, :count => 2
-    assert_select "tr>td", :text => 1.to_s, :count => 2
-  end
-end
diff --git a/spec/views/fetmeetingtops/new.html.erb_spec.rb b/spec/views/fetmeetingtops/new.html.erb_spec.rb
deleted file mode 100644
index 43611f8..0000000
--- a/spec/views/fetmeetingtops/new.html.erb_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe "fetmeetingtops/new" do
-  before(:each) do
-    assign(:fetmeetingtop, stub_model(Fetmeetingtop,
-      :title => "MyString",
-      :text => "MyText",
-      :discussion => "MyText",
-      :ersteller => "MyString",
-      :fetmeeting_id => 1
-    ).as_new_record)
-  end
-
-  it "renders new fetmeetingtop form" do
-    render
-
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", fetmeetingtops_path, "post" do
-      assert_select "input#fetmeetingtop_title[name=?]", "fetmeetingtop[title]"
-      assert_select "textarea#fetmeetingtop_text[name=?]", "fetmeetingtop[text]"
-      assert_select "textarea#fetmeetingtop_discussion[name=?]", "fetmeetingtop[discussion]"
-      assert_select "input#fetmeetingtop_ersteller[name=?]", "fetmeetingtop[ersteller]"
-      assert_select "input#fetmeetingtop_fetmeeting_id[name=?]", "fetmeetingtop[fetmeeting_id]"
-    end
-  end
-end
diff --git a/spec/views/fetmeetingtops/show.html.erb_spec.rb b/spec/views/fetmeetingtops/show.html.erb_spec.rb
deleted file mode 100644
index d566f58..0000000
--- a/spec/views/fetmeetingtops/show.html.erb_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "fetmeetingtops/show" do
-  before(:each) do
-    @fetmeetingtop = assign(:fetmeetingtop, stub_model(Fetmeetingtop,
-      :title => "Title",
-      :text => "MyText",
-      :discussion => "MyText",
-      :ersteller => "Ersteller",
-      :fetmeeting_id => 1
-    ))
-  end
-
-  it "renders attributes in <p>" do
-    render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should match(/Title/)
-    rendered.should match(/MyText/)
-    rendered.should match(/MyText/)
-    rendered.should match(/Ersteller/)
-    rendered.should match(/1/)
-  end
-end