add geocoder, near friends view
merge