integrated table view with survey list view
fixed merged conflict for tableview integration