Now displaying the player's name.
Now using the player's name for messages.
Merged Master into Weapons