Merge branch 'develop' of github.com:Vizzuality/gfw into feature/map-v2

Author: edbrett

Gemfile.lock

@@ -320,7 +320,7 @@ GEM
       mini_portile2 (~> 2.3.0)
     public_suffix (3.0.2)
     puma (3.11.3)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-proxy (0.6.4)
       rack
     rack-reverse-proxy (0.11.0)
@@ -438,7 +438,7 @@ GEM
       builder (~> 3.0)
     spring (2.0.2)
       activesupport (>= 4.2)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
@@ -534,4 +534,4 @@ RUBY VERSION
    ruby 2.4.0p0
 
 BUNDLED WITH
-   1.16.1
+   1.16.2