merge in jme3 goodies