Merge remote-tracking branch 'origin'

config/routes.rb

@@ -156,13 +156,34 @@ Fetsite::Application.routes.draw do
           get :verwalten
           get :sanitize
           get :is_updated
+          get :documents
+          get :meetings
         end
         resources :attachments
       end
-            
+      
       resources :calendars
       get 'verwalten/calendars', :controller=>:calendars, :action=>:verwalten, :as=>'calendars_verwalten'
       resources :calentries
+      resources :documents do
+        member do
+          get :write
+          get :write_etherpad
+          get :read_from_etherpad
+          get :dump_to_etherpad
+        end
+      end
+      resources :meetings do
+        member do
+          get :announce
+          get :create_protocol
+          get :create_agenda 
+        end
+        
+      end
+      
+    
+      resources :meetingtyps
     end
   end
   root :to => 'home#index'