fix the lat/long bug. Google changed data structure of places
fix merge conflicts