Merge branch 'master' into fix-apple-device

Author: liberaldev

Gemfile.lock

@@ -150,8 +150,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.5.1)
     regexp_parser (2.6.1)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rouge (3.30.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -174,7 +173,6 @@ GEM
     sassc (2.4.0)
       ffi (~> 1.9)
     servolux (0.13.0)
-    strscan (3.1.0)
     temple (0.9.1)
     terser (1.1.13)
       execjs (>= 0.3.0, < 3)
@@ -185,7 +183,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
-    webrick (1.7.0)
+    webrick (1.8.2)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)