fixed gmap inconsistancies
merge conflicts GONE