bug fix in addresses_controller.rb
DEV-20024
orders_history
fix all_addresses
fix bug
finish upgrade
Merge branch 'master' into spree_2_1_rails_4