Pull from master

Gemfile.lock

@@ -50,6 +50,13 @@ GEM
     airbrussh (1.3.0)
       sshkit (>= 1.6.1, != 1.7.0)
     arel (8.0.0)
+    axlsx (2.0.1)
+      htmlentities (~> 4.3.1)
+      nokogiri (>= 1.4.1)
+      rubyzip (~> 1.0.0)
+    axlsx_rails (0.5.1)
+      actionpack (>= 3.1)
+      axlsx (>= 2.0.1)
     bcrypt (3.1.11)
     bindex (0.5.0)
     builder (3.2.3)
@@ -100,6 +107,7 @@ GEM
       railties (>= 3.2, < 5.2)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    htmlentities (4.3.4)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     i18n (0.9.1)
@@ -201,6 +209,10 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redis (3.3.5)
+    roo (1.13.2)
+      nokogiri
+      rubyzip
+      spreadsheet (> 0.6.4)
     rspec-core (3.7.0)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -219,6 +231,7 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
     ruby-ole (1.2.12.1)
+    rubyzip (1.0.0)
     sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -290,6 +303,8 @@ PLATFORMS
 
 DEPENDENCIES
   aescrypt
+  axlsx (= 2.0.1)
+  axlsx_rails
   bcrypt (~> 3.1.7)
   byebug
   cancancan (~> 1.10)
@@ -325,13 +340,14 @@ DEPENDENCIES
   rack-cors
   rails (~> 5.1.0)
   redis (~> 3.0)
+  roo
   rspec-rails (~> 3.5)
+  rubyzip (= 1.0.0)
   sass-rails (~> 5.0)
   schema_to_scaffold
   shoulda-matchers (~> 3.1)
   sidekiq
   simple_form
-  spreadsheet
   spring
   spring-watcher-listen (~> 2.0.0)
   tether-rails