Pulling tableView Branch

Pulling tableView branch to test and address issues posted on Github