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

app/models/meeting.rb

@@ -1,6 +1,7 @@
 class Meeting < ActiveRecord::Base
   belongs_to :parent, :polymorphic=>true
   belongs_to :meetingtyp
+
   attr_accessible :desc, :intern, :name, :parent_id, :parent_type, :calentry,:calentry_attributes, :meetingtyp_id
 
   belongs_to :neuigkeit
@@ -60,6 +61,7 @@ class Meeting < ActiveRecord::Base
       self.agenda=d
     end
   end
+<<<<<<< HEAD
   def self.new_divid_for(parent)
     "meeting_new_parent_" + parent.class.to_s + "_" + parent.id.to_s 
   end
@@ -68,4 +70,6 @@ class Meeting < ActiveRecord::Base
   end
 
 
+=======
+>>>>>>> origin/documentmeeting
 end