Merge branch 'develop' into refactor_type_de_xxx

Conflicts:
	db/schema.rb

db/migrate/20151112151918_add_json_lat_lngs_to_dossier.rb

@@ -0,0 +1,5 @@
+class AddJsonLatLngsToDossier < ActiveRecord::Migration
+  def change
+    add_column :dossiers, :json_latlngs, :text
+  end
+end

db/migrate/20151113171605_create_exercice_table.rb

@@ -0,0 +1,11 @@
+class CreateExerciceTable < ActiveRecord::Migration
+  def change
+    create_table :exercices do |t|
+      t.string :ca
+      t.datetime :dateFinExercice
+      t.integer :date_fin_exercice_timestamp
+    end
+
+    add_reference :exercices, :etablissement, references: :etablissements
+  end
+end