Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop

Conflicts:
	db/schema.rb

db/migrate/20150922141000_add_state_to_dossier.rb

@@ -0,0 +1,6 @@
+class AddStateToDossier < ActiveRecord::Migration
+  def change
+    remove_column :dossiers, :dossier_termine
+    add_column :dossiers, :state, :string
+  end
+end

db/schema.rb

@@ -11,6 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+
 ActiveRecord::Schema.define(version: 20150922141232) do
 
   # These are extensions that must be enabled in order to support this database
@@ -42,11 +43,11 @@ ActiveRecord::Schema.define(version: 20150922141232) do
     t.string   "nom_projet"
     t.string   "montant_projet"
     t.string   "montant_aide_demande"
-    t.boolean  "dossier_termine"
     t.integer  "procedure_id"
     t.date     "date_previsionnelle"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string  "state"
   end
 
   add_index "dossiers", ["procedure_id"], name: "index_dossiers_on_procedure_id", using: :btree