implemented category selection by setting 'categories' array in json manifest file
removed unnecessary UITextFieldDelegate from ShelfViewController
fix merge conflicts with current master; adopt new coding styles
changed category selection method to UIActionSheet (list items in popover)
Merge pull request #352 from tobiasstrebitzer/feature-categories

Feature: Category Filter
Merge branch 'tobiasstrebitzer-feature-shelf-options'
Fixed merge conflicts