GCW Zones now display on the Planet Map
Merge pull request #22 from Waverunner/miscFeatures

Added /tip command
Finished serverside collision detection, fixed some engine errors at startup, updated engine with collision classes
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Added all NPC city markers
Added all NPC city markers
Merge pull request #23 from Kecidek/master

NPC city markers
Fixed radial option ids that were larger than 127 (signed byte limit)
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Added Combat Command class, fixed datatables (engine)
Fixed crash caused by engine
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	ngengine_public.jar
Merge remote-tracking branch 'origin/master' into guildDevice