- Fixed typo in Weapon
Merge remote-tracking branch 'origin/master'