Merge branch 'master' into depfu/update/capistrano-3.11.0

Gemfile.lock

@@ -297,8 +297,8 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.4)
@@ -317,6 +317,9 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     ref (2.0.0)
     request_store (1.1.0)
     responders (2.4.0)
@@ -366,8 +369,12 @@ GEM
     rushover (0.3.0)
       json
       rest-client
-    sass (3.4.23)
-    sass-rails (5.0.6)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -404,7 +411,7 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
-    tilt (2.0.7)
+    tilt (2.0.8)
     timecop (0.7.4)
     tins (1.6.0)
     tzinfo (1.2.5)