Merge pull request #1 from ProjectSWGCore/master

Revert "Refactored WeaponObject"
Refactored WeaponObject
Merge pull request #1114 from Treeku/WeaponObjectRefactor

Weapon object refactor
Merge remote-tracking branch 'upstream/master'