Merge branch 'gordon'
changes to purchase_items, add_items, etc.