Map Issue

- (UIView *) mapView:(GMSMapView *)  mapView markerInfoWindow:
(GMSMarker *) marker function
Merge branch 'master' of https://github.com/iphone201988/Fondoo28may

Conflicts:

KeithDatingApp/source/viewcontrollers/MapViewController/MapViewControlle
r.m