add new states
Merge branch 'master' of https://github.com/casualsteps/spree_shipment_status

Conflicts:
	config/locales/ko.yml