Merge pull request #211 from ping19/master

Moved weapon text into Utils class and properties