Quiet conflict : social movements, institutional change, and upgrading informal settlements in South Africa · Study