Made changes to import google maps.
Google Maps importing correctly
Merge branch 'master' into ameya_map