Updated ResourceService to be much smaller and more efficient
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/services/resources/ResourceService.java
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge pull request #23 from ProjectSWGCore/master

Fork update
Changed Some NPC spawn points to use loiter
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Changed Several NPC Spawns to use loiter

Fixed unused import error from last commit
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge pull request #1039 from tacef/master

Changed Some NPC Spawns to use loiter
Revert "Changed Some NPC Spawns to use loiter"
Merge pull request #1053 from ProjectSWGCore/revert-1039-master

Revert "Changed Some NPC Spawns to use loiter"
Merge pull request #24 from ProjectSWGCore/master

Fork update
Changed trading so it's more responsive

Will need to refactor how most of this stuff is done, it's pretty ugly
atm. For now I changed so the trading maps will only store the object
ID's, this way we don't have the objects not being traded (since they
aren't initialized)
Changed Romo Vax to use correct template

Added Mos Eisley Police officer
Added Mos Eisley Police Sergeant
Changed Romo Vax Henchman to use correct template
Changed Smuggler Pilot in front of Jabba's Palace to use correct
Template
Added Mos Eisley Police and made them patroling around eisley
Fixed Showpos

Showpos now returns proper cell id and buildingid
Changed Showpos command

Changed Showpos command to add different strings to clipboard depending
if you are inside a building or not
Fixed resource and survey system
Merge branch 'master' of https://github.com/Obique/NGECore2