Merge branch 'develop' into develop_v2

# Conflicts:
#	db/schema.rb

db/migrate/20161205110427_create_table_preference_devise_profil.rb

@@ -0,0 +1,11 @@
+class CreateTablePreferenceDeviseProfil < ActiveRecord::Migration
+  def change
+    create_table :preference_devise_profils do |t|
+      t.string :last_current_devise_profil
+    end
+
+    add_belongs_to :preference_devise_profils, :administrateurs
+    add_belongs_to :preference_devise_profils, :gestionnaires
+    add_belongs_to :preference_devise_profils, :users
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161110082244) do
+ActiveRecord::Schema.define(version: 20161205110427) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -261,6 +261,13 @@ ActiveRecord::Schema.define(version: 20161110082244) do
     t.index ["type_de_piece_justificative_id"], name: "index_pieces_justificatives_on_type_de_piece_justificative_id", using: :btree
   end
 
+  create_table "preference_devise_profils", force: :cascade do |t|
+    t.string  "last_current_devise_profil"
+    t.integer "administrateurs_id"
+    t.integer "gestionnaires_id"
+    t.integer "users_id"
+  end
+
   create_table "preference_list_dossiers", force: :cascade do |t|
     t.string  "libelle"
     t.string  "table"