Remove deprecated methods

* BaseHelper#money
* Order#price_adjustments
* Order#price_adjustment_totals
* ShippingMethod#zone
* ShippingMethod#zone=
* Product#variants_with_only_master
Prep for 2.1 release
Bump to 2.1.1.beta
Prep for 2.1.1 release
Do not generate a new identifier for a payment when it is re-saved

Fixes #3733
remove unnecessary semicolon in screen.css.scss

Fixes #3729
Bump to 2.1.2.beta
Merge remote-tracking branch 'upstream/2-1-stable'

Conflicts:
	README.md
	SPREE_VERSION
	cmd/lib/spree_cmd/extension.rb
	core/lib/spree/core/version.rb