merging with micks updates aftertiledmap.java was added
merging minor updates after tiledmap.java was added