Inventory: Made the default count of an item 1 when added instead of zero.  Should fix a bug.
Merge branch 'temp' into M7