Merged CollidingObject with TileCollision. Various fixes.