Merge pull request #47 from nikicat/master

fixed image build logic
Shipment.images: include parent Images in list