Fix up naming of Search SdkModel types
Merge branch 'unify_controllers' of github.com:eegeo/mobile-example-app into unify_controllers