map file updated
fixed merge conflicts
added geobar gem