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
Update Makefile.Windows

Couldn't compile here until I added explicit reference to the libraries. This on Windows 7 + MinGW (standard)
Merge Beanbag ammo.

Conflicts:
	data/raw/items/ammo.json
_( ) monattack.cpp
_( ) mondeath.cpp
_( ) ranged.cpp
Make Heat Drain an active bionic
Make Heat Drain only use power on a successful drain