Spoke w/ Francisco to reconcile our concepts/vision for items &
inventory management
Merge branch 'master' into ItemsWithInventory