Remove 2-0-stable compatibility from master in README
Add newline to install_generator.rb

Fix issue where installing subsequent gems causes syntax error in app/assets/javascripts/admin/all.js
Allow bumping selenium-webdriver
Fix variant eager loading in Shipment `manifest`

See https://github.com/spree/spree/pull/3687
Allow users to dont split packages

Replay changes from https://github.com/spree/spree/pull/3618
Fix order_id assignment in OrderInventory

See https://github.com/spree/spree/pull/3712
Replace :confirm option by data: { confirm: "text" }

:confirm will be deprecated as of rails 4.1
Replace deprecated LIKE constant for arel matches
fix syntax error
Depend on Spree ~> 2.1
Merge branch 'master' into 2-1-stable

Conflicts:
	spree_product_assembly.gemspec
Point to spree/spree 2-1-stable in Gemfile