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 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
Fixed resource and survey system
Merge branch 'master' of https://github.com/Obique/NGECore2