Merge pull request #13 from ProjectSWGCore/master

Fork update
Merge pull request #14 from ProjectSWGCore/Ziggy

Ziggy
Update NPCS to fit recent changes to mobiletemplate and weapontemplate
Merge pull request #832 from tacef/master

NPC Update