merged with jdutil.  friendly id changes.  Supplier links now work using friendly_ids.  Supplier <-> Stock Locations fix