merge with master

Gemfile

@@ -46,9 +46,11 @@ gem 'mini_magick'
 gem 'cups'
 gem 'prawn'
 gem 'prawn-table'
-gem 'spreadsheet'
 gem 'to_xls-rails'
-
+gem 'rubyzip', '= 1.0.0'
+gem 'axlsx', '= 2.0.1'
+gem 'axlsx_rails'
+gem 'roo'
 #Reporting gem
 #gem 'compendium'
 #gem "cancan"
@@ -81,7 +83,6 @@ gem 'kaminari', '~> 1.0.1'
 gem 'filterrific'
 
 gem 'cancancan', '~> 1.10'
-
 #pageless no need for current
 # gem 'will_paginate'
 # gem 'pageless-rails', github: 'rorlab/pageless-rails'
@@ -129,4 +130,4 @@ gem 'momentjs-rails' # for date-range selector
 # gem 'bootstrap-datepicker-rails' # date picker
 # gem 'jquery-datetimepicker-rails'
 # gem 'select2-rails' # for multi-select and auto-complete select box
-gem "chartkick" #chart lib
+gem "chartkick" #chart lib