merging https://github.com/radar/spree/commit/53b5414482f34991c0fdf46c8ff9960838c87fdf
removing the kaminari version to control it from the Gemfile