Shift-click merge fix

Shift-clicking will merge same item ids with different damage values,
taking the damage value from the inventory item.
Merge pull request #99 from emris/ShiftClickMerge

Shift-click merge fix