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
Beanbags

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

Conflicts:
	data/raw/items/ammo.json
Add stunning effect to beanbag rounds.
Windows icon fix + related code cleanup
Very small cleanup / warning fix
Grab a local reference to a retrieved field in many places instead of retrieving it multiple times.
Stash a reference to a field instead of a copy of it.
Somehow the project didn't get saved. Now it is