Add shipping addresses

This is the second of the three PR's for this story.

Following the pattern of Galaxy and Chameleon, this PR is for develop, but I had to merge master first, which is where most of the differences come from.