Upgrade to spree 2-0-stable
Merge pull request #15 from nicocharlery/2-0-stable

Upgrade to spree 2-0-stable
make scope activerecord 4.1 compatible
Merge pull request #17 from jormon/rails-4-1-x

make scope activerecord 4.1 compatible
Merge branch 'refs/heads/master' into 2-3-stable

Conflicts:
	spree_shipstation.gemspec