Changed the way in which objects are loaded from the map.
Quadtree implemented.
Fixed merge conflict.