added googlemaps api
added googlemaps example
fixed merge conflict