Resolving dependencies
Upgrading to spree 2.x
Merge commit 'd5551c5839e956264473781d9d63263aaf74e889' into 2-2-stable

* commit 'd5551c5839e956264473781d9d63263aaf74e889':
  Upgrading to spree 2.x
  Resolving dependencies

Conflicts:
	Gemfile
	lib/spree_correios/engine.rb
	spec/spec_helper.rb
	spree_correios.gemspec