Fixed various bugs
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/resources/objects/tangible/TangibleObject.java