Remove left over merge file
Remove searchTable.
Modified iPadViewController and NewsSearchController to handle not having a dedicated tableview.

Incorporating search into iPadViewController to make grid and list view available when searching.
Moved getMoreStoriesForSection implementation from iPadCategoryViewController into iPadViewController.

Removed tableview implementation from SearchController and implemented get more stories in iPadViewController
Make sure view is in the position it was before we started searching.
renamed variables
Removed unneeded code.
Renamed variables.
Merge branch 'refs/heads/3.6/NewsStoryHeaderReusableView' into 3.6/news-search
Added isPreviousStateASingleDataSource to accompany for view being a category and still having a single data source when exiting search.
Fixed activity view and no results view  not showing on search.
Fixed category search not showing correct stories.
removed unneeded code
Fixed search going back to main stories when clicking on dimmed area while having search field as first responder and having search stories present.
Merge branch 'refs/heads/3.6/ipad-news' into 3.6/news-search

Conflicts:
	Modules/News/iPad/Views/XIBs/MITNewsSearchController.xib
Need to keep height cache around for estimatedHeightForRowAtIndexPath when we switch from search to main/category view or we cannot scroll back to position we were at last.
FIX for: When switching between other views and search the refresh controls update time is of the other views and not search's. When refreshing in search that date is taken as the other views update time.

Fixes issue #249.
Merge branch 'refs/heads/3.6/ipad-news' into 3.6/news-search

Conflicts:
	Modules/News/iPad/View Controllers/MITNewsSearchController.m
Merge pull request #253 from MIT-Mobile/3.6/news-search

3.6/news search