Merge pull request #13 from ProjectSWGCore/master

Fork update
MobileTemplate weapon refactor
Updated a couple of corellian NPC scripts
Merge pull request #14 from ProjectSWGCore/Ziggy

Ziggy
Attempt at fixing exception
Revert "Attempt at fixing exception"

This reverts commit 721ee816774a518a4b561973d8cdff89c5ec71dd.
Update NPCS to fit recent changes to mobiletemplate and weapontemplate
Merge pull request #832 from tacef/master

NPC Update
Merge pull request #833 from ProjectSWGCore/Ziggy

MobileTemplate update