Changing superclass from UITableViewController to UIViewController
merging