Tucson City Council expands zoning areas for marijuana dispensaries