Updated ResourceService to be much smaller and more efficient
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

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 branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
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)
Merge pull request #2 from ProjectSWGCore/master

pull
Fixed resource and survey system
Fixed resource and survey system
Merge branch 'master' of https://github.com/Obique/NGECore2
Merge branch 'master' of https://github.com/Obique/NGECore2