Fix inventory::restack a bit
Make inventory::add_item handle ammo/meds properly
Fix NPC inventory iteration (not necessary any longer).
Make player/npc destructors virtual
Merge Stacking fixes.
Merge Quick bugfixes for #614 (NPC update).