Merge branch 'develop' of github.com:sgmap/tps into develop

# Conflicts:
#	app/views/admin/procedures/_modal_publish.html.haml

spec/controllers/admin/procedures_controller_spec.rb

@@ -364,7 +364,7 @@ describe Admin::ProceduresController, type: :controller do
         it { expect(flash[:notice]).to have_content 'Procédure archivée' }
       end
 
-      context 'when owner want reactive procedure' do
+      context 'when owner want to re-enable procedure' do
         before do
           put :publish, procedure_id: procedure.id, procedure_path: 'fake_path'
           procedure.reload