FIX conflicts and update marker
Merge branch 'master' of github.com:zwant/city_autocomplete
Showing country name in autocomplete and marker