Spree 2-1-stable preparations
Fixes for 2-1-stables
Merge branch 'master' of github.com:Willianvdv/spree_mitch_buchannon

Conflicts:
	spec/spec_helper.rb
Removed duplicate coveralls gem