Merge staging for release

Gemfile.lock

@@ -58,7 +58,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    airbrussh (1.3.0)
+    airbrussh (1.3.1)
       sshkit (>= 1.6.1, != 1.7.0)
     arel (6.0.4)
     autoprefixer-rails (9.3.1)
@@ -93,7 +93,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.2)
     crass (1.0.4)
     cube-ruby (0.0.3)
     daemons (1.2.6)
@@ -155,10 +155,10 @@ GEM
     oj (3.7.0)
     open_uri_redirections (0.2.1)
     popper_js (1.14.3)
-    pry (0.11.3)
+    pry (0.12.0)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (1.6.10)
+    rack (1.6.11)
     rack-mini-profiler (1.0.0)
       rack (>= 1.2.0)
     rack-test (0.6.3)
@@ -290,4 +290,4 @@ DEPENDENCIES
   will_paginate (~> 3.0)
 
 BUNDLED WITH
-   1.16.3
+   1.17.1

app/views/layouts/_appliance.html.haml

@@ -17,7 +17,7 @@
     = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/handlebars.js/2.0.0/handlebars.min.js"
     = javascript_include_tag "//www.google.com/recaptcha/api/js/recaptcha_ajax.js"
     = javascript_include_tag "//ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"
-    = javascript_include_tag "//unpkg.com/split.js/split.min.js"
+    = javascript_include_tag "//unpkg.com/split.js/dist/split.min.js"
 
     %script
       jQuery(document).data({bp: {config: #{bp_config_json.html_safe}, user: #{(session[:user] || {}).to_hash.to_json.html_safe}}});

app/views/layouts/_header.html.erb

@@ -29,7 +29,7 @@
   <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/handlebars.js/2.0.0/handlebars.min.js" %>
   <%= javascript_include_tag "//www.google.com/recaptcha/api/js/recaptcha_ajax.js" %>
   <%= javascript_include_tag "//ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js" %>
-  <%= javascript_include_tag "//unpkg.com/split.js/split.min.js" %>
+  <%= javascript_include_tag "//unpkg.com/split.js/dist/split.min.js" %>
 
   <script>
     jQuery(document).data({bp: {config: <%=bp_config_json.html_safe%>, user: <%=(session[:user] || {}).to_hash.to_json.html_safe%>}});

app/views/layouts/angular.html.erb

@@ -37,7 +37,7 @@
   <%=javascript_include_tag "//www.google.com/recaptcha/api/js/recaptcha_ajax.js"%>
   <%=javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.1/Chart.min.js"%>
   <%=javascript_include_tag "//ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"%>
-  <%=javascript_include_tag "//unpkg.com/split.js/split.min.js"%>
+  <%=javascript_include_tag "//unpkg.com/split.js/dist/split.min.js"%>
   <script>
     jQuery(document).data({bp: {config: <%=bp_config_json.html_safe%>, user: <%=(session[:user] || {}).to_hash.to_json.html_safe%>}});
     jQuery(document).data().bp.ontology = <%=@ontology.to_json.html_safe%> || {};

app/views/layouts/popup.html.erb

@@ -14,7 +14,7 @@
   <%= javascript_include_tag "//www.google.com/recaptcha/api/js/recaptcha_ajax.js" %>
   <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.1/Chart.min.js" %>
   <%= javascript_include_tag "//ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js" %>
-  <%= javascript_include_tag "//unpkg.com/split.js/split.min.js" %>
+  <%= javascript_include_tag "//unpkg.com/split.js/dist/split.min.js" %>
   <script>
     jQuery(document).data({bp: {config: <%=bp_config_json.html_safe%>, user: <%=(session[:user] || {}).to_hash.to_json.html_safe%>}});
     jQuery(document).data().bp.ontology = <%=@ontology.to_json.html_safe%> || {};