works with spree 2.2.2
cleanup
updated
fix rspec test
merge with 2-2-stable