Added optional MKAnnotation properties to amenity annotations. Changed annotations creation in map view controller to use the optional properties.