Relative calm returns to Johannesburg after violence