fixed #337 and removed some lock contention
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2