Merge branch 'develop' into develop_v2

# Conflicts:
#	Gemfile.lock
#	db/schema.rb

db/migrate/20161110082244_add_champ_id_to_commentaires.rb

@@ -0,0 +1,7 @@
+class AddChampIdToCommentaires < ActiveRecord::Migration
+  def change
+    change_table :commentaires do |t|
+      t.references :champ, null: true, index: true
+    end
+  end
+end

db/schema.rb

@@ -111,6 +111,8 @@ ActiveRecord::Schema.define(version: 20161115053251) do
     t.integer  "dossier_id"
     t.datetime "updated_at",             null: false
     t.integer  "piece_justificative_id"
+    t.integer  "champ_id"
+    t.index ["champ_id"], name: "index_commentaires_on_champ_id", using: :btree
     t.index ["dossier_id"], name: "index_commentaires_on_dossier_id", using: :btree
   end