Merge github.com:GlenDC/StarEngine

Conflicts:
	jni/SceneGraph/Object.h