working
resolved conflicts
done get city and location
done address issue
Merge pull request #82 from priyanka-techmaes/bugs-develop

Bugs develop