Cape Town inner-city renewal to include townships