bit more work on vendors
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/services/bazaar/BazaarService.java