North Korea to join Olympics in South Korea as tensions ease