Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting

Conflicts:
	app/controllers/documents_controller.rb
	app/controllers/meetings_controller.rb
	app/models/ability.rb
	app/models/document.rb
	app/models/meeting.rb
	app/models/meetingtyp.rb
	app/views/documents/_document.html.erb
	app/views/documents/_nested_form.html.erb
	app/views/documents/edit.js.erb
	app/views/documents/new.js.erb
	app/views/meetings/_meeting.html.erb
	app/views/themen/_small.html.erb
	config/routes.rb

config/routes.rb

@@ -166,10 +166,14 @@ Fetsite::Application.routes.draw do
       resources :documents 
       resources :meetings do
         member do
+
           get :announce
           get :create_protocol
           get :create_agenda 
         end
+
+      end
+
       end
       resources :meetingtyps
     end