some stuff I forgot to commit
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/main/NGECore.java