Update iPhone storyboard to use the new categories class
Updated search bar cancel button to a navigation item so we don't have to go into the uisearchbar subviews and enable the Cancel button when search bar isn't first responder.

iPhone search navigation bar tweaks.