Merge pull request #1 from ProjectSWGCore/master

test
Merge pull request #2 from ProjectSWGCore/master

merge
Merge pull request #3 from ProjectSWGCore/master

gdxg
Started work on Factional NPC's

Added setFaction and setFactionStatus to Mobiletemplate
Continued Work on Factional NPC scripts
Dantooine-wide spawns added with Planetary Spawn Tool

Considering the combat level ranges from live, the planet's surface has
been covered with spawn areas for various mobs and NPCs. A small as
possible count of collidables was used to save server resources while
still being able to realize the spawns.
Merge remote-tracking branch 'origin/master' into DantooineSpawns
Added gcw award for pvp
Minor changes

Not sure why the gcw time is always 888d, 33h ahead.  The epoch time is
definitely sent correct in seconds.  Adding and subtracting server
times, born date or anything else hasn't had an effect.
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/resources/objects/player/PlayerObject.java
More work on Faction NPC's
Merge pull request #680 from tacef/master

Started work on Factional NPC's
Fixed Error in MobileTemplate factionStatus
Merge pull request #681 from tacef/master

Fixed Error in MobileTemplate factionStatus
Fixed Filename error with Probotdrone
Merge pull request #4 from ProjectSWGCore/master

Update local fork
Continued Work on Factional NPC scripts

Updated Restuss hand with Optionbitmask
Fixed illegal argument exception in SWGSet
Merge pull request #682 from tacef/master

Fixed Filenameerror
Edits to some mobiles

Corrections