part way through changing player.cpp to add_msg_action
finished modifiying player.cpp
converted melee.cpp over to add_msg_action
fixed ranged.cpp
updated disease.cpp with add_msg stuff
updated iuse.cpp with new add_msg stuff
merged with latest code
merged with latest version; compiles
fixed small bug
Merge player or npc message display.
Refactor handling messages about player or NPCs to be more i18n friendly.
Intelligence dependent skill rust
Add CBM: Uncanny Dodge
fix logic error
Fix uncanny_dodge() comment in player.h
ignore benign traps when dodging
Skill Book Focus Drain Rebalance

Reduce focus loss from skill books from -100 to -50.  Had this fix as
part of my studious nature perk but my total inability to get gettext to
work has essentially cut me out of development :(   I'm not going to be
able to finish studious nature, so I thought I'd just submit this by
itself.  Talked with Funnyman about this when I was still able to work
on my perk mod, and we seemed to think this value was pretty balanced
(Even Funnyman agreed the original value was WAY to high).  It worked
fine before with all my other changes, so I don't see any reason it
shouldn't work on its own.  Although for obvious reasons I can't test
it.  Well this'll probably be my last pull request so I wish you all the
best with working on this awesome game.  I'll probably still play the
experimental builds occasionally but I can't see myself trying to code
anything new since I can't test it.  So see ya chummers, G'luck in your
struggles!  (Hope someone gets this reference)
Beanbags

Adds beanbag ammos for shotguns and 40mm
Merge Beanbag ammo.

Conflicts:
	data/raw/items/ammo.json
Add stunning effect to beanbag rounds.