added new ObjectData.java
Merge remote-tracking branch 'upstream/master'
parsed useful objects.xml stuff
improved some functions

findItem and findGround and findObject can take either type or id as the
searchterm
Merge remote-tracking branch 'upstream/master'