Added Sola Shapes Files to Database_ondo
fixed merge conflict on sola_populate_shapefiles.sql