geocode returning ip address
Merge branch 'master' into feature/geocoder
merging style changes
working search by city
fix conflicts