first step
second step
fix tests
migrations
finish upgrade
Merge branch 'master' into spree_2_1_rails_4
Merge branch 'master' into spree_2_1_rails_4