fixed object db exception, updated engine to reduce desync on zoning in
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/services/SimulationService.java