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/ability.rb

@@ -116,6 +116,7 @@ class Ability
       cannot :delete, Neuigkeit
     end
     # Calendar
+
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
       can :manage, Document
       can :manage, Meeting