Merge branch 'develop' into france_connect

# Conflicts:
#	db/schema.rb

db/migrate/20150928141512_add_use_api_carto_to_procedure.rb

@@ -0,0 +1,5 @@
+class AddUseAPICartoToProcedure < ActiveRecord::Migration
+  def change
+    add_column :procedures, :use_api_carto, :boolean, :default => false
+  end
+end

db/schema.rb

@@ -118,9 +118,10 @@ ActiveRecord::Schema.define(version: 20151008090835) do
     t.string   "organisation"
     t.string   "direction"
     t.string   "lien_demarche"
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
     t.boolean  "test"
+    t.boolean  "use_api_carto", default: false
   end
 
   create_table "types_de_piece_justificative", force: :cascade do |t|