Merging the rest of JME engine with official trunk rev 10290