diff --git a/Gemfile b/Gemfile
index dbefab4c0..b99597f66 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,14 +2,13 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.7.1'
+gem 'rails', '5.0.0.1'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.1.0'
+
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 gem 'therubyracer', platforms: :ruby
 
@@ -47,10 +46,10 @@ gem 'bootstrap-sass', '~> 3.3.5'
 gem 'will_paginate-bootstrap'
 
 # Decorators
-gem 'draper'
+gem 'draper', '~> 3.0.0.pre1'
 
 #Gestion des comptes utilisateurs
-gem 'devise', '~> 3.0'
+gem 'devise'
 gem 'openid_connect'
 
 gem 'rest-client'
@@ -111,6 +110,10 @@ group :test do
   gem 'vcr'
 end
 
+group :development do
+  gem 'web-console', '~> 2.0'
+end
+
 group :development, :test do
   # gem 'terminal-notifier'
   # gem 'terminal-notifier-guard'
@@ -120,7 +123,6 @@ group :development, :test do
   gem 'pry-byebug'
 
   # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 2.0'
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
@@ -135,7 +137,7 @@ group :development, :test do
 
   gem "nyan-cat-formatter"
 
-  gem 'parallel_tests', '~> 1.9.0'
+  gem 'parallel_tests', '~> 2.10'
 
   gem 'brakeman', require: false
   # Deploy
diff --git a/Gemfile.lock b/Gemfile.lock
index a42023ff3..8ea318242 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,150 +1,147 @@
 GIT
   remote: https://github.com/mina-deploy/mina.git
-  revision: a66b55a72833b19ac0ffb240afb37c86c0227582
+  revision: 5f407b28be1cf05cdfaab0558285aa031c445491
   specs:
-    mina (0.3.7)
+    mina (1.0.3)
       open4 (~> 1.3.4)
       rake
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    CFPropertyList (2.3.3)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_model_serializers (0.8.3)
-      activemodel (>= 3.0)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    active_model_serializers (0.10.2)
+      actionpack (>= 4.1, < 6)
+      activemodel (>= 4.1, < 6)
+      jsonapi (~> 0.1.1.beta2)
+      railties (>= 4.1, < 6)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activemodel-serializers-xml (1.0.1)
+      activemodel (> 5.x)
+      activerecord (> 5.x)
+      activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     apipie-rails (0.3.1)
       json
-    arel (6.0.3)
+    arel (7.1.4)
     as_csv (2.0.2)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       responders
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    attr_required (1.0.0)
-    autoprefixer-rails (5.2.1)
+    ast (2.3.0)
+    attr_required (1.0.1)
+    autoprefixer-rails (6.5.3)
       execjs
-      json
     bcrypt (3.1.11)
-    bindata (2.1.0)
+    bindata (2.3.4)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-datepicker-rails (1.4.0)
+    bootstrap-datepicker-rails (1.6.4.1)
       railties (>= 3.0)
-    bootstrap-sass (3.3.5)
-      autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.2.19)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     bootstrap-wysihtml5-rails (0.3.3.8)
       railties (>= 3.0)
-    brakeman (3.1.1)
-      erubis (~> 2.6)
-      fastercsv (~> 1.5)
-      haml (>= 3.0, < 5.0)
-      highline (~> 1.6)
-      multi_json (~> 1.2)
-      ruby2ruby (>= 2.1.1, < 2.3.0)
-      ruby_parser (~> 3.7.0)
-      sass (~> 3.0)
-      slim (>= 1.3.6, < 4.0)
-      terminal-table (~> 1.4)
-    browser (2.2.0)
+    brakeman (3.4.1)
+    browser (2.3.0)
     builder (3.2.2)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
-    capybara (2.4.4)
+    byebug (9.0.6)
+    capybara (2.10.1)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (0.10.0)
+    carrierwave (0.11.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
-    chartkick (1.3.2)
-    childprocess (0.5.5)
+      mimemagic (>= 0.3.0)
+    chartkick (2.1.1)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    clamav-client (3.0.0)
+    clamav-client (3.1.0)
     cliver (0.3.2)
-    coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coderay (1.1.1)
+    coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.2.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    columnize (0.9.0)
+    coffee-script-source (1.10.0)
     concurrent-ruby (1.0.2)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    database_cleaner (1.4.1)
+    database_cleaner (1.5.3)
     debug_inspector (0.0.2)
-    deep_cloneable (2.2.1)
+    deep_cloneable (2.2.2)
       activerecord (>= 3.1.0, < 5.2.0)
-    devise (3.5.10)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.20161021)
       unf (>= 0.0.5, < 1.0.0)
-    draper (2.1.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
+    draper (3.0.0.pre1)
+      actionpack (~> 5.0)
+      activemodel (~> 5.0)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (~> 5.0)
       request_store (~> 1.0)
     erubis (2.7.0)
-    excon (0.49.0)
+    excon (0.54.0)
     execjs (2.7.0)
-    factory_girl (4.5.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fastercsv (1.5.5)
-    ffi (1.9.6)
+    ffi (1.9.14)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.38.0)
@@ -184,12 +181,12 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.9.2)
-      fog-core (~> 1.27)
+    fog-aws (0.12.0)
+      fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.10.1)
+    fog-brightbox (0.11.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
@@ -198,7 +195,7 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.38.0)
+    fog-core (1.43.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -216,22 +213,20 @@ GEM
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.3.0)
+    fog-local (0.3.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.5)
-      fog-core (>= 1.38)
+    fog-openstack (0.1.17)
+      fog-core (>= 1.40)
       fog-json (>= 1.0)
-      fog-xml (>= 0.1)
       ipaddress (>= 0.8)
     fog-powerdns (0.1.1)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-rackspace (0.1.1)
+    fog-profitbricks (3.0.0)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
+    fog-rackspace (0.1.2)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -250,7 +245,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.1)
+    fog-softlayer (1.1.4)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -265,21 +260,21 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (0.6.4)
+    fog-vsphere (1.5.1)
       fog-core
-      rbvmomi (~> 1.8)
+      rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
       fog-core
       fog-xml
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.4.0.0)
-      railties (>= 3.2, < 5.0)
+    font-awesome-rails (4.7.0.0)
+      railties (>= 3.2, < 5.1)
     formatador (0.2.5)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     haml-rails (0.9.0)
       actionpack (>= 4.0.1)
@@ -287,104 +282,113 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashie (3.4.1)
-    highline (1.7.8)
+    hashdiff (0.3.0)
+    hashie (3.4.6)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httpclient (2.6.0.1)
+    httpclient (2.8.2.4)
     i18n (0.7.0)
     inflecto (0.0.2)
     ipaddress (0.8.3)
-    jbuilder (2.3.1)
-      activesupport (>= 3.0.0, < 5)
+    jbuilder (2.6.0)
+      activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.0.4)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.2.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
-    json-jwt (1.5.1)
+    json-jwt (1.6.5)
       activesupport
       bindata
       multi_json (>= 1.3)
       securecompare
       url_safe_base64
-    kaminari (0.16.3)
+    jsonapi (0.1.1.beta6)
+      jsonapi-parser (= 0.1.1.beta3)
+      jsonapi-renderer (= 0.1.1.beta1)
+    jsonapi-parser (0.1.1.beta3)
+    jsonapi-renderer (0.1.1.beta1)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.9.3)
+    kgio (2.10.0)
     leaflet-draw-rails (0.1.0)
     leaflet-markercluster-rails (0.7.0)
       railties (>= 3.1)
-    leaflet-rails (0.7.4)
-    libv8 (3.16.14.7)
+    leaflet-rails (0.7.7)
+    libv8 (3.16.14.15)
     logstash-event (1.2.02)
-    logstasher (0.6.5)
+    logstasher (1.0.1)
+      activerecord (>= 4.0)
+      activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    mailjet (1.1.0)
+    mailjet (1.4.10)
       activesupport (>= 3.1.0)
       rack (>= 1.4.0)
       rest-client
     maruku (0.7.2)
     method_source (0.8.2)
-    mime-types (2.99.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    multi_json (1.11.2)
+    minitest (5.9.1)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
-    netrc (0.10.3)
-    nokogiri (1.6.8)
+    netrc (0.11.0)
+    nio4r (1.2.1)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     nyan-cat-formatter (0.11)
       rspec (>= 2.99, >= 2.14.2, < 4)
     open4 (1.3.4)
-    openid_connect (0.9.2)
+    openid_connect (0.12.0)
       activemodel
       attr_required (>= 1.0.0)
       json (>= 1.4.3)
       json-jwt (>= 1.5.0)
-      rack-oauth2 (>= 1.2.1)
+      rack-oauth2 (>= 1.3.1)
       swd (>= 1.0.0)
       tzinfo
       validate_email
       validate_url
       webfinger (>= 1.0.1)
-    openstack (2.0.2)
+    openstack (3.3.3)
       json
     orm_adapter (0.5.0)
     parallel (1.9.0)
-    parallel_tests (1.9.0)
+    parallel_tests (2.10.0)
       parallel
-    parser (2.2.2.2)
-      ast (>= 1.1, < 3.0)
-    pg (0.18.2)
-    pkg-config (1.1.7)
-    poltergeist (1.6.0)
+    parser (2.3.1.4)
+      ast (~> 2.2)
+    pg (0.19.0)
+    poltergeist (1.11.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    powerpack (0.1.0)
-    pry (0.10.1)
+    powerpack (0.1.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.2.0)
-      byebug (~> 5.0)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
       pry (~> 0.10)
-    rack (1.6.4)
-    rack-oauth2 (1.2.1)
+    public_suffix (2.0.4)
+    rack (2.0.1)
+    rack-oauth2 (1.4.0)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
@@ -392,88 +396,85 @@ GEM
       rack (>= 1.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    railroady (1.3.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railroady (1.5.2)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.0.0)
-    raindrops (0.13.0)
-    rake (11.2.2)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
-    rdoc (4.2.0)
-      json (~> 1.4)
+    rainbow (2.1.0)
+    raindrops (0.17.0)
+    rake (11.3.0)
+    rbvmomi (1.9.4)
+      builder (~> 3.2)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      trollop (~> 2.1)
+    rdoc (4.3.0)
     ref (2.0.0)
-    request_store (1.1.0)
+    request_store (1.3.1)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    rest-client (1.8.0)
+    rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rgeo (0.3.20)
-    rgeo-geojson (0.3.1)
-      rgeo (~> 0.3)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rgeo (0.5.3)
+    rgeo-geojson (0.4.3)
+      rgeo (~> 0.5)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.1)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    rubocop (0.30.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.1, < 3.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.45.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    rubocop-checkstyle_formatter (0.2.0)
-      rubocop (>= 0.20.1)
-    rubocop-rspec (1.3.0)
-    ruby-progressbar (1.7.5)
-    ruby2ruby (2.1.4)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.7.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-checkstyle_formatter (0.3.0)
+      rubocop (>= 0.30.1)
+    rubocop-rspec (1.8.0)
+      rubocop (>= 0.42.0)
+    ruby-progressbar (1.8.1)
+    ruby_parser (3.8.3)
       sexp_processor (~> 4.1)
-    rubyzip (1.1.7)
+    rubyzip (1.2.0)
     safe_yaml (1.0.4)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -485,72 +486,68 @@ GEM
     scenic (1.3.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    sdoc (0.4.1)
+    sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
     securecompare (1.0.0)
-    selenium-webdriver (2.44.0)
+    selenium-webdriver (3.0.1)
       childprocess (~> 0.5)
-      multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sentry-raven (0.13.1)
-      faraday (>= 0.7.6)
-    sexp_processor (4.6.0)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.9.1)
+    sentry-raven (2.1.2)
+      faraday (>= 0.7.6, < 0.10.x)
+    sexp_processor (4.7.0)
+    shoulda-matchers (3.1.1)
+      activesupport (>= 4.0.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slim (3.0.6)
-      temple (~> 0.7.3)
-      tilt (>= 1.3.3, < 2.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
-    smart_listing (1.1.2)
+    smart_listing (1.2.0)
       coffee-rails
       jquery-rails
-      kaminari (~> 0.16.1)
+      kaminari (~> 0.17)
       rails (>= 3.2)
-    spring (1.3.6)
+    spring (2.0.0)
+      activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    swd (1.0.0)
+    swd (1.0.1)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
       i18n
       json (>= 1.4.3)
-    temple (0.7.6)
-    terminal-table (1.5.2)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.5)
-    timecop (0.7.3)
+    timecop (0.8.1)
     trollop (2.1.2)
-    turbolinks (2.5.3)
-      coffee-rails
+    turbolinks (5.0.1)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.2)
+    uglifier (3.0.3)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
-    unicorn (4.9.0)
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.1.1)
+    unicorn (5.2.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
     url_safe_base64 (0.2.2)
     validate_email (0.1.6)
@@ -559,26 +556,27 @@ GEM
     validate_url (1.0.2)
       activemodel (>= 3.0.0)
       addressable
-    vcr (3.0.1)
+    vcr (3.0.3)
     warden (1.2.6)
       rack (>= 1.0)
-    web-console (2.2.1)
+    web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    webfinger (1.0.1)
+    webfinger (1.0.2)
       activesupport
       httpclient (>= 2.4)
       multi_json
-    webmock (1.21.0)
+    webmock (2.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket (1.2.1)
-    websocket-driver (0.5.3)
+      hashdiff
+    websocket (1.2.3)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.0.7)
+    will_paginate (3.1.5)
     will_paginate-bootstrap (1.0.1)
       will_paginate (>= 3.0.3)
     xml-simple (1.1.5)
@@ -602,11 +600,10 @@ DEPENDENCIES
   carrierwave
   chartkick
   clamav-client
-  coffee-rails (~> 4.1.0)
   database_cleaner
   deep_cloneable (~> 2.2.1)
-  devise (~> 3.0)
-  draper
+  devise
+  draper (~> 3.0.0.pre1)
   factory_girl
   fog
   fog-openstack
@@ -625,12 +622,12 @@ DEPENDENCIES
   nyan-cat-formatter
   openid_connect
   openstack
-  parallel_tests (~> 1.9.0)
+  parallel_tests (~> 2.10)
   pg
   poltergeist
   pry-byebug
   railroady
-  rails (= 4.2.7.1)
+  rails (= 5.0.0.1)
   rest-client
   rgeo-geojson
   rspec-rails (~> 3.0)
@@ -658,4 +655,4 @@ DEPENDENCIES
   will_paginate-bootstrap
 
 BUNDLED WITH
-   1.13.2
+   1.13.6
diff --git a/Guardfile b/Guardfile
index 2c60c7b22..55e984025 100644
--- a/Guardfile
+++ b/Guardfile
@@ -43,7 +43,7 @@ guard 'livereload' do
   rails_view_exts = %w(erb haml slim)
 
   # file types LiveReload may optimize refresh for
-  compiled_exts = extensions.values.uniq
+  compiled_exts = extensions.values.distinct
   watch(%r{public/.+\.(#{compiled_exts * '|'})})
 
   extensions.each do |ext, type|
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 410f1c103..8c636918d 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,6 +1,6 @@
 class APIController < ApplicationController
   before_action :authenticate_user
-  before_filter :default_format_json
+  before_action :default_format_json
 
   def authenticate_user
     render json: {}, status: 401 unless valid_token?
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 103ca5526..582d42cbc 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
-  before_filter :check_browser
+  before_action :check_browser
 
   def default_url_options
     return { protocol: 'https' } if Rails.env.staging? || Rails.env.production?
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index 857d04111..56e0fb3b4 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -1,6 +1,6 @@
 class Users::RegistrationsController < Devise::RegistrationsController
-# before_filter :configure_sign_up_params, only: [:create]
-# before_filter :configure_account_update_params, only: [:update]
+# before_action :configure_sign_up_params, only: [:create]
+# before_action :configure_account_update_params, only: [:update]
 
   def after_sign_up_path_for(resource_or_scope)
     WelcomeMailer.welcome_email(resource_or_scope).deliver_now!
diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
index a582ade20..a8ff410f1 100644
--- a/app/controllers/users/sessions_controller.rb
+++ b/app/controllers/users/sessions_controller.rb
@@ -1,5 +1,5 @@
 class Users::SessionsController < Sessions::SessionsController
-# before_filter :configure_sign_in_params, only: [:create]
+# before_action :configure_sign_in_params, only: [:create]
 
   def demo
     return redirect_to root_path if Rails.env.production?
diff --git a/app/services/dossiers_list_gestionnaire_service.rb b/app/services/dossiers_list_gestionnaire_service.rb
index 7cb09366f..82abd938e 100644
--- a/app/services/dossiers_list_gestionnaire_service.rb
+++ b/app/services/dossiers_list_gestionnaire_service.rb
@@ -49,7 +49,7 @@ class DossiersListGestionnaireService
 
   def filter_dossiers
     @filter_dossiers ||= @procedure.nil? ? @current_devise_profil.dossiers.joins(joins_filter).where(where_filter) : @procedure.dossiers.joins(joins_filter).where(where_filter)
-    @filter_dossiers.uniq
+    @filter_dossiers.distinct
   end
 
   def filter_procedure_reset!
diff --git a/app/views/admin/accompagnateurs/_list_not_assign.html.haml b/app/views/admin/accompagnateurs/_list_not_assign.html.haml
index 8d036f9ae..a5794d082 100644
--- a/app/views/admin/accompagnateurs/_list_not_assign.html.haml
+++ b/app/views/admin/accompagnateurs/_list_not_assign.html.haml
@@ -3,7 +3,7 @@
     = text_field_tag :filter, '', class: "search form-control",
                               placeholder: "Recherche...", autocomplete: :off
   %button.btn.btn-primary{type: :submit}
-    %span.glyphicon.glyphicon-search
+    %span.fa.fa-search
 
 - unless smart_listing.empty?
 
diff --git a/app/views/admin/gestionnaires/_list.html.haml b/app/views/admin/gestionnaires/_list.html.haml
index caceecc00..48cdd8f68 100644
--- a/app/views/admin/gestionnaires/_list.html.haml
+++ b/app/views/admin/gestionnaires/_list.html.haml
@@ -8,11 +8,11 @@
       %tr
         %td{style:'padding-top: 11px; font-size:15px'}= gestionnaire.email
         %td{ style: 'text-align:right' }
-          .delete.btn.btn-sm.glyphicon.glyphicon-remove
+          .delete.btn.btn-sm.fa.fa-trash
 
           .confirm
             =link_to 'Valider', admin_gestionnaire_path(id: gestionnaire.id), {method: :delete, class: 'btn btn-sm btn-success'}
-            .cancel.btn.btn-sm.btn-danger.glyphicon.glyphicon-minus{style: 'top: 0'}
+            .cancel.btn.btn-sm.btn-danger.fa.fa-minus{style: 'top: 0'}
 
   = smart_listing.paginate
   = smart_listing.pagination_per_page_links
diff --git a/app/views/administrateurs/sessions/new.html.haml b/app/views/administrateurs/sessions/new.html.haml
index 2c2185b9b..4dda316e2 100644
--- a/app/views/administrateurs/sessions/new.html.haml
+++ b/app/views/administrateurs/sessions/new.html.haml
@@ -13,14 +13,14 @@
         = f.label :email
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-user
+          %span.fa.fa-user
         = f.email_field :email, class: 'form-control'
       %br
       %h4
         = f.label 'Mot de passe'
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-asterisk
+          %span.fa.fa-asterisk
         = f.password_field :password, class: 'form-control', value: @administrateur.password
       %br
       %br
diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml
index 824a41aa7..06d77a192 100644
--- a/app/views/dossiers/_pieces_justificatives.html.haml
+++ b/app/views/dossiers/_pieces_justificatives.html.haml
@@ -10,7 +10,7 @@
             %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
             %span{style:'margin-left:12px'}
               \-
-            %a.btn.glyphicon.glyphicon-time{style:'color: black; padding-top: 0',
+            %a.btn.fa.fa-timer{style:'color: black; padding-top: 0',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
@@ -33,7 +33,7 @@
             %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
             %span{style:'margin-left:12px'}
               \-
-            %a.btn.glyphicon.glyphicon-time{style:'color: black; padding-top: 0',
+            %a.btn.fa.fa-timer{style:'color: black; padding-top: 0',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
diff --git a/app/views/gestionnaires/passwords/edit.html.haml b/app/views/gestionnaires/passwords/edit.html.haml
index 7b387b366..a0d7ed99c 100644
--- a/app/views/gestionnaires/passwords/edit.html.haml
+++ b/app/views/gestionnaires/passwords/edit.html.haml
@@ -15,14 +15,14 @@
 
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-asterisk
+          %span.fa.fa-asterisk
         = f.password_field :password, autofocus: true, autocomplete: "off", class: 'form-control'
       %br
       %h4
         = f.label 'Retaper le mot de passe'
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-asterisk
+          %span.fa.fa-asterisk
         = f.password_field :password_confirmation, autocomplete: "off", class: 'form-control'
       %br
       %br
diff --git a/app/views/gestionnaires/passwords/new.html.haml b/app/views/gestionnaires/passwords/new.html.haml
index b0e8cddb9..a8c09db1f 100644
--- a/app/views/gestionnaires/passwords/new.html.haml
+++ b/app/views/gestionnaires/passwords/new.html.haml
@@ -14,7 +14,7 @@
         = f.label :email
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-user
+          %span.fa.fa-user
         = f.email_field :email, class: 'form-control', placeholder: 'Email'
       %br
       %br
diff --git a/app/views/gestionnaires/sessions/new.html.haml b/app/views/gestionnaires/sessions/new.html.haml
index d6e4dc203..0180bd760 100644
--- a/app/views/gestionnaires/sessions/new.html.haml
+++ b/app/views/gestionnaires/sessions/new.html.haml
@@ -12,14 +12,14 @@
         = f.label :email
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-user
+          %span.fa.fa-user
         = f.email_field :email, class: 'form-control'
       %br
       %h4
         = f.label :password
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-asterisk
+          %span.fa.fa-asterisk
         = f.password_field :password, autocomplete: "off", class: 'form-control', value: @gestionnaire.password
       %br
       %br
diff --git a/app/views/users/passwords/edit.html.haml b/app/views/users/passwords/edit.html.haml
index bcfb616b7..326e95239 100644
--- a/app/views/users/passwords/edit.html.haml
+++ b/app/views/users/passwords/edit.html.haml
@@ -43,14 +43,14 @@
 
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-asterisk
+          %span.fa.fa-asterisk
         = f.password_field :password, autofocus: true, autocomplete: "off", class: 'form-control'
       %br
       %h4
         = f.label 'Retaper le mot de passe'
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-asterisk
+          %span.fa.fa-asterisk
         = f.password_field :password_confirmation, autocomplete: "off", class: 'form-control'
       %br
       %br
diff --git a/app/views/users/passwords/new.html.haml b/app/views/users/passwords/new.html.haml
index a08703e6a..e597944e4 100644
--- a/app/views/users/passwords/new.html.haml
+++ b/app/views/users/passwords/new.html.haml
@@ -42,7 +42,7 @@
         = f.label :email
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-user
+          %span.fa.fa-user
         = f.email_field :email, class: 'form-control', placeholder: 'Email'
       %br
       %br
diff --git a/app/views/users/registrations/new.html.haml b/app/views/users/registrations/new.html.haml
index b44bc289c..dec162c92 100644
--- a/app/views/users/registrations/new.html.haml
+++ b/app/views/users/registrations/new.html.haml
@@ -42,19 +42,19 @@
         = f.label :email
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-user
+          %span.fa.fa-user
         = f.email_field :email, class: 'form-control', placeholder: 'Email', value: params[:user_email]
       %br
       %h4
         = f.label :password
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-asterisk
+          %span.fa.fa-asterisk
         = f.password_field :password, autocomplete: "off", class: 'form-control', placeholder: 'Mot de passe'
       %br
       .input-group
         .input-group-addon
-          %span.glyphicon.glyphicon-asterisk
+          %span.fa.fa-asterisk
         = f.password_field :password_confirmation, autocomplete: "off", class: 'form-control', placeholder: 'Répeter le mot de passe'
       %br
       %br
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 52c597431..f7174bfa2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -9,6 +9,9 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
+  config.public_file_server.enabled   = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5c1b32e48..8640a6aae 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -22,7 +22,7 @@ Rails.application.configure do
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/test.rb b/config/environments/test.rb
index addde8b69..2d98c2462 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,8 +13,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled   = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
diff --git a/db/schema.rb b/db/schema.rb
index 7ef1e735e..a42535f59 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -30,20 +29,18 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "api_token"
+    t.index ["email"], name: "index_administrateurs_on_email", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_administrateurs_on_reset_password_token", unique: true, using: :btree
   end
 
-  add_index "administrateurs", ["email"], name: "index_administrateurs_on_email", unique: true, using: :btree
-  add_index "administrateurs", ["reset_password_token"], name: "index_administrateurs_on_reset_password_token", unique: true, using: :btree
-
   create_table "administrateurs_gestionnaires", id: false, force: :cascade do |t|
     t.integer "administrateur_id"
     t.integer "gestionnaire_id"
+    t.index ["administrateur_id"], name: "index_administrateurs_gestionnaires_on_administrateur_id", using: :btree
+    t.index ["gestionnaire_id", "administrateur_id"], name: "unique_couple_administrateur_gestionnaire", unique: true, using: :btree
+    t.index ["gestionnaire_id"], name: "index_administrateurs_gestionnaires_on_gestionnaire_id", using: :btree
   end
 
-  add_index "administrateurs_gestionnaires", ["administrateur_id"], name: "index_administrateurs_gestionnaires_on_administrateur_id", using: :btree
-  add_index "administrateurs_gestionnaires", ["gestionnaire_id", "administrateur_id"], name: "unique_couple_administrateur_gestionnaire", unique: true, using: :btree
-  add_index "administrateurs_gestionnaires", ["gestionnaire_id"], name: "index_administrateurs_gestionnaires_on_gestionnaire_id", using: :btree
-
   create_table "administrations", force: :cascade do |t|
     t.string   "email",                  default: "", null: false
     t.string   "encrypted_password",     default: "", null: false
@@ -57,19 +54,23 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.inet     "last_sign_in_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_administrations_on_email", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_administrations_on_reset_password_token", unique: true, using: :btree
   end
 
-  add_index "administrations", ["email"], name: "index_administrations_on_email", unique: true, using: :btree
-  add_index "administrations", ["reset_password_token"], name: "index_administrations_on_reset_password_token", unique: true, using: :btree
+  create_table "ar_internal_metadata", primary_key: "key", id: :string, force: :cascade do |t|
+    t.string   "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
 
   create_table "assign_tos", id: false, force: :cascade do |t|
     t.integer "gestionnaire_id"
     t.integer "procedure_id"
+    t.index ["gestionnaire_id"], name: "index_assign_tos_on_gestionnaire_id", using: :btree
+    t.index ["procedure_id"], name: "index_assign_tos_on_procedure_id", using: :btree
   end
 
-  add_index "assign_tos", ["gestionnaire_id"], name: "index_assign_tos_on_gestionnaire_id", using: :btree
-  add_index "assign_tos", ["procedure_id"], name: "index_assign_tos_on_procedure_id", using: :btree
-
   create_table "cadastres", force: :cascade do |t|
     t.string  "surface_intersection"
     t.float   "surface_parcelle"
@@ -91,20 +92,18 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.integer  "user_id"
     t.string   "original_filename"
     t.string   "content_secure_token"
+    t.index ["dossier_id"], name: "index_cerfas_on_dossier_id", using: :btree
   end
 
-  add_index "cerfas", ["dossier_id"], name: "index_cerfas_on_dossier_id", using: :btree
-
   create_table "champs", force: :cascade do |t|
     t.string  "value"
     t.integer "type_de_champ_id"
     t.integer "dossier_id"
     t.string  "type"
+    t.index ["dossier_id"], name: "index_champs_on_dossier_id", using: :btree
+    t.index ["type_de_champ_id"], name: "index_champs_on_type_de_champ_id", using: :btree
   end
 
-  add_index "champs", ["dossier_id"], name: "index_champs_on_dossier_id", using: :btree
-  add_index "champs", ["type_de_champ_id"], name: "index_champs_on_type_de_champ_id", using: :btree
-
   create_table "commentaires", force: :cascade do |t|
     t.string   "email"
     t.datetime "created_at",             null: false
@@ -112,10 +111,9 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.integer  "dossier_id"
     t.datetime "updated_at",             null: false
     t.integer  "piece_justificative_id"
+    t.index ["dossier_id"], name: "index_commentaires_on_dossier_id", using: :btree
   end
 
-  add_index "commentaires", ["dossier_id"], name: "index_commentaires_on_dossier_id", using: :btree
-
   create_table "dossiers", force: :cascade do |t|
     t.boolean  "autorisation_donnees"
     t.string   "nom_projet"
@@ -128,18 +126,16 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.boolean  "archived",             default: false
     t.boolean  "mandataire_social",    default: false
     t.datetime "deposit_datetime"
+    t.index ["procedure_id"], name: "index_dossiers_on_procedure_id", using: :btree
+    t.index ["user_id"], name: "index_dossiers_on_user_id", using: :btree
   end
 
-  add_index "dossiers", ["procedure_id"], name: "index_dossiers_on_procedure_id", using: :btree
-  add_index "dossiers", ["user_id"], name: "index_dossiers_on_user_id", using: :btree
-
   create_table "drop_down_lists", force: :cascade do |t|
     t.string  "value"
     t.integer "type_de_champ_id"
+    t.index ["type_de_champ_id"], name: "index_drop_down_lists_on_type_de_champ_id", using: :btree
   end
 
-  add_index "drop_down_lists", ["type_de_champ_id"], name: "index_drop_down_lists_on_type_de_champ_id", using: :btree
-
   create_table "entreprises", force: :cascade do |t|
     t.string   "siren"
     t.integer  "capital_social"
@@ -154,10 +150,9 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.string   "nom"
     t.string   "prenom"
     t.integer  "dossier_id"
+    t.index ["dossier_id"], name: "index_entreprises_on_dossier_id", using: :btree
   end
 
-  add_index "entreprises", ["dossier_id"], name: "index_entreprises_on_dossier_id", using: :btree
-
   create_table "etablissements", force: :cascade do |t|
     t.string  "siret"
     t.boolean "siege_social"
@@ -173,10 +168,9 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.string  "code_insee_localite"
     t.integer "dossier_id"
     t.integer "entreprise_id"
+    t.index ["dossier_id"], name: "index_etablissements_on_dossier_id", using: :btree
   end
 
-  add_index "etablissements", ["dossier_id"], name: "index_etablissements_on_dossier_id", using: :btree
-
   create_table "exercices", force: :cascade do |t|
     t.string   "ca"
     t.datetime "dateFinExercice"
@@ -187,11 +181,10 @@ ActiveRecord::Schema.define(version: 20161102154835) do
   create_table "follows", force: :cascade do |t|
     t.integer "gestionnaire_id"
     t.integer "dossier_id"
+    t.index ["dossier_id"], name: "index_follows_on_dossier_id", using: :btree
+    t.index ["gestionnaire_id"], name: "index_follows_on_gestionnaire_id", using: :btree
   end
 
-  add_index "follows", ["dossier_id"], name: "index_follows_on_dossier_id", using: :btree
-  add_index "follows", ["gestionnaire_id"], name: "index_follows_on_gestionnaire_id", using: :btree
-
   create_table "france_connect_informations", force: :cascade do |t|
     t.string  "gender"
     t.string  "given_name"
@@ -201,10 +194,9 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.string  "france_connect_particulier_id"
     t.integer "user_id"
     t.string  "email_france_connect"
+    t.index ["user_id"], name: "index_france_connect_informations_on_user_id", using: :btree
   end
 
-  add_index "france_connect_informations", ["user_id"], name: "index_france_connect_informations_on_user_id", using: :btree
-
   create_table "gestionnaires", force: :cascade do |t|
     t.string   "email",                  default: "", null: false
     t.string   "encrypted_password",     default: "", null: false
@@ -219,21 +211,19 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "procedure_filter"
+    t.index ["email"], name: "index_gestionnaires_on_email", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_gestionnaires_on_reset_password_token", unique: true, using: :btree
   end
 
-  add_index "gestionnaires", ["email"], name: "index_gestionnaires_on_email", unique: true, using: :btree
-  add_index "gestionnaires", ["reset_password_token"], name: "index_gestionnaires_on_reset_password_token", unique: true, using: :btree
-
   create_table "individuals", force: :cascade do |t|
     t.string  "nom"
     t.string  "prenom"
     t.string  "birthdate"
     t.integer "dossier_id"
     t.string  "gender"
+    t.index ["dossier_id"], name: "index_individuals_on_dossier_id", using: :btree
   end
 
-  add_index "individuals", ["dossier_id"], name: "index_individuals_on_dossier_id", using: :btree
-
   create_table "invites", force: :cascade do |t|
     t.string  "email"
     t.string  "email_sender"
@@ -254,10 +244,9 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.boolean "use_api_carto",          default: false
     t.boolean "quartiers_prioritaires", default: false
     t.boolean "cadastre",               default: false
+    t.index ["procedure_id"], name: "index_module_api_cartos_on_procedure_id", unique: true, using: :btree
   end
 
-  add_index "module_api_cartos", ["procedure_id"], name: "index_module_api_cartos_on_procedure_id", unique: true, using: :btree
-
   create_table "pieces_justificatives", force: :cascade do |t|
     t.string   "content"
     t.integer  "dossier_id"
@@ -266,11 +255,10 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.integer  "user_id"
     t.string   "original_filename"
     t.string   "content_secure_token"
+    t.index ["dossier_id"], name: "index_pieces_justificatives_on_dossier_id", using: :btree
+    t.index ["type_de_piece_justificative_id"], name: "index_pieces_justificatives_on_type_de_piece_justificative_id", using: :btree
   end
 
-  add_index "pieces_justificatives", ["dossier_id"], name: "index_pieces_justificatives_on_dossier_id", using: :btree
-  add_index "pieces_justificatives", ["type_de_piece_justificative_id"], name: "index_pieces_justificatives_on_type_de_piece_justificative_id", using: :btree
-
   create_table "preference_list_dossiers", force: :cascade do |t|
     t.string  "libelle"
     t.string  "table"
@@ -294,10 +282,9 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.string  "path",              limit: 30
     t.integer "procedure_id"
     t.integer "administrateur_id"
+    t.index ["path"], name: "index_procedure_paths_on_path", using: :btree
   end
 
-  add_index "procedure_paths", ["path"], name: "index_procedure_paths_on_path", using: :btree
-
   create_table "procedures", force: :cascade do |t|
     t.string   "libelle"
     t.string   "description"
@@ -336,10 +323,9 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.date    "date_declaration"
     t.date    "date_publication"
     t.integer "entreprise_id"
+    t.index ["entreprise_id"], name: "index_rna_informations_on_entreprise_id", using: :btree
   end
 
-  add_index "rna_informations", ["entreprise_id"], name: "index_rna_informations_on_entreprise_id", using: :btree
-
   create_table "types_de_champ", force: :cascade do |t|
     t.string  "libelle"
     t.string  "type_champ"
@@ -375,11 +361,10 @@ ActiveRecord::Schema.define(version: 20161102154835) do
     t.datetime "updated_at"
     t.string   "siret"
     t.string   "loged_in_with_france_connect", default: "false"
+    t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
   end
 
-  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
-
   add_foreign_key "cerfas", "dossiers"
   add_foreign_key "commentaires", "dossiers"
   add_foreign_key "dossiers", "users"
diff --git a/public/fonts/bootstrap/glyphicons-halflings-regular.woff b/public/fonts/bootstrap/glyphicons-halflings-regular.woff
deleted file mode 100755
index 9e612858f..000000000
Binary files a/public/fonts/bootstrap/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/public/fonts/bootstrap/glyphicons-halflings-regular.woff2 b/public/fonts/bootstrap/glyphicons-halflings-regular.woff2
new file mode 100644
index 000000000..64539b54c
Binary files /dev/null and b/public/fonts/bootstrap/glyphicons-halflings-regular.woff2 differ