Fix gun unloading (gives n bullets, rather than n stacks of bullets)
Merge branch 'unload-bugfix' of github.com:ethankaminski/Cataclysm-DDA
Resolves #594
Merge branch 'inventory-charge-merge-fix'