fix order.merge!
Merge branch '2-0-stable' of https://github.com/RuanShan/spree_abc into 2-0-stable