merge change of BoundaryMapView.swift and Info.plist