Google Map functionality
Merge conflict solved