Added Google Map
fixed merge conflict
more maps test