Merging changes from other machine.
Added a new subclass of UITableViewController, & corresponding unit tests.
Added some code to programmatically query for more filter categories.
Modified unit tests.
Merge remote-tracking branch 'origin/master'
Made various changes.