GCW Zone implementation, functions for guilds
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/services/object/ObjectService.java
Merge remote-tracking branch 'upstream/master'