Add shipments association to stock locations.

Conflicts:
	core/app/models/spree/stock_location.rb