Use state_text in address decorator
Merge branch '2-1-stable' of github.com:j27lee/spree_address_book into 2-1-stable