WIP:

Merge remote-tracking branch 'upstream/2-2-stable' into 2-1-lav

Conflicts:
	Gemfile
	app/assets/javascripts/store/spree_gift_card.js
	app/assets/stylesheets/admin/spree_gift_card.css
	app/assets/stylesheets/store/spree_gift_card.css
	app/controllers/spree/checkout_controller_decorator.rb
	app/controllers/spree/store_controller_decorator.rb
	app/models/spree/adjustment_decorator.rb
	app/models/spree/calculator/gift_card.rb
	app/models/spree/gift_card.rb
	spec/models/spree/calculator/gift_card_spec.rb
	spree_gift_card.gemspec

Change-Id: I5c1470be1e29df303fb06d5d6b81d82ebac952a9