diff --git a/Gemfile.BASE b/Gemfile.BASE
new file mode 100644
index 0000000..77ab012
--- /dev/null
+++ b/Gemfile.BASE
@@ -0,0 +1,64 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.9'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+gem 'execjs', '~>1.4.0' 
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'bootstrap-sass','~> 2.2.0'
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+   gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'debugger'
+
+# Formbuilder for easier form generation
+gem 'formtastic', '~>2.2.1'
+gem 'formtastic-bootstrap'
+gem "tinymce-rails" , '>=3.5.8'
+
+# Internationalisierung
+gem "globalize3"  ,'~>0.3.0'
+
+# Version controll
+gem "paper_trail" , '>=2.7.0'
+
+# User management
+gem "devise" ,'~>2.2.3'
+
+# Roles for users
+gem "rolify"
+
+# Abilities
+gem "cancan"
+
+# Fileupload
+gem 'paperclip' ,'~>3.4.0'
+gem 'git''
\ No newline at end of file
diff --git a/Gemfile.LOCAL b/Gemfile.LOCAL
new file mode 100644
index 0000000..351f858
--- /dev/null
+++ b/Gemfile.LOCAL
@@ -0,0 +1,71 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.9'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+  gem 'sqlite3'
+  gem 'execjs', '~>1.4.0' 
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails', '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'bootstrap-sass','~> 2.2.0'
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  gem 'therubyracer', :platforms => :ruby
+  gem 'uglifier', '>= 1.0.3'
+end
+
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'debugger'
+
+
+# Formbuilder for easier form generation
+gem 'formtastic', '~>2.2.1'
+gem 'formtastic-bootstrap'
+# TinyMCE
+gem "tinymce-rails" , '>=3.5.8'
+
+# Internationalisierung
+gem "globalize3"  ,'~>0.3.0'
+
+# Version controll
+gem "paper_trail" , '>=2.7.0'
+
+# User management
+gem "devise" ,'~>2.2.3'
+
+# Roles for users
+gem "rolify"
+
+# Abilities
+gem "cancan"
+
+# Fileupload
+<<<<<<< HEAD
+gem 'paperclip' ,'~>3.4.0'
+
+# Git
+gem 'git'
+=======
+gem 'paperclip' ,'~>3.4.0'
+>>>>>>> parent of 1085698... add GIT gem
diff --git a/Gemfile.REMOTE b/Gemfile.REMOTE
new file mode 100644
index 0000000..6a8c227
--- /dev/null
+++ b/Gemfile.REMOTE
@@ -0,0 +1,63 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.9'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+gem 'execjs', '~>1.4.0' 
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'bootstrap-sass','~> 2.2.0'
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+   gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'debugger'
+
+# Formbuilder for easier form generation
+gem 'formtastic', '~>2.2.1'
+gem 'formtastic-bootstrap'
+gem "tinymce-rails" , '>=3.5.8'
+
+# Internationalisierung
+gem "globalize3"  ,'~>0.3.0'
+
+# Version controll
+gem "paper_trail" , '>=2.7.0'
+
+# User management
+gem "devise" ,'~>2.2.3'
+
+# Roles for users
+gem "rolify"
+
+# Abilities
+gem "cancan"
+
+# Fileupload
+gem 'paperclip' ,'~>3.4.0'
\ No newline at end of file
diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index 1af6a78..1f906ed 100644
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -63,7 +63,10 @@ class RubrikenController < ApplicationController
       end
     end
   end
-
+  def verwalten
+  @rubrik = Rubrik.find(params[:id])
+  @moderatoren=User.with_role(:newsmoderator,@rubrik)
+  end
   # DELETE /rubriken/1
   # DELETE /rubriken/1.json
   def destroy
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index cb8724d..96ab1fc 100644
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -1,4 +1,11 @@
-w<p id="notice"><%= notice %></p>
+
+<ul class="breadcrumb">
+<li>
+<%= link_to "Neuigkeiten"  , rubriken_path%> <span class="divider">/</span></li>
+<li><%= link_to @rubrik.name , rubrik_path(@rubrik)%></li>
+
+</ul>
+<p id="notice"><%= notice %></p>
 <div class="row-fluid">
 <span class="span12">
   <h1><%= @rubrik.name %></h1>
@@ -27,14 +34,8 @@ w<p id="notice"><%= notice %></p>
 
 <div class="row-fluid">
 <span class="span12">
-<%= semantic_form_for @rubrik, :url=> url_for(:action => 'addmoderator',:id=>@rubrik.id) do |f| %>
-<%= f.inputs do %>
-<%= f.input :moderator, :as => :select, :collection => Hash[User.all.map{|b| [b.email,b.id]}] ,:label=>"Hinzufuegen"%>
-<% end %>
-<%= f.action :submit %>
-<% end %>
+<%= link_to 'Verwalten', verwalten_rubrik_path(@rubrik) %> |
 
-<%= link_to 'Edit', edit_rubrik_path(@rubrik) %> |
 <%= link_to 'Back', rubriken_path %> | 
 <%= link_to 'Destroy', @rubrik, method: :delete, data: { confirm: 'Are you sure?' } %>
 </span></div>
\ No newline at end of file
diff --git a/app/views/rubriken/verwalten.html.erb b/app/views/rubriken/verwalten.html.erb
new file mode 100644
index 0000000..fe08a32
--- /dev/null
+++ b/app/views/rubriken/verwalten.html.erb
@@ -0,0 +1,20 @@
+ <p id="notice"><%= notice %></p>
+ 
+ <h1><%= @rubrik.name %></h1>
+<table class="table">
+<b>Moderatoren:</b><i>
+<% @moderatoren.each do |m|%>
+<tr><td>
+<%= m.email%></td><td>Entfernen</td></tr>
+<% end%></i>
+
+
+
+<%= semantic_form_for @rubrik, :url=> url_for(:action => 'addmoderator',:id=>@rubrik.id) do |f| %>
+<%= f.inputs do %>
+<%= f.input :moderator, :as => :select, :collection => Hash[User.all.map{|b| [b.email,b.id]}] ,:label=>"Hinzufuegen"%>
+<% end %>
+<%= f.action :submit %>
+<% end %>
+<%= link_to 'Edit', edit_rubrik_path(@rubrik) %> |
+<%= link_to 'Anzeigen', rubrik_path(@rubrik) %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 974ec78..2ee4230 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -36,6 +36,7 @@ devise_for :users
     resources :rubriken
 
     put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
+    get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
     resources :home