Update Google Map js and style
Merge Conflict resolved