Fix typo
Merge branch 'master' of github.com:codelation/spree_shipstation
Fix shipping company element