Changes made to improve the loading of shapefiles and to start importing from the database, though this is not finished yet.