Merge pull request #1 from SupSuper/master

cancel action on opening inventory or stats screen.
Add Melee action type BT_MELEE and melee damage assimilated as ARMOR PIERCING
Merge pull request #673 from GixG/ufopaediaDamageTypes

Fix Bug report #291  -  Ufopaedia doesn't show stun rod damage