Basic search works
Removed "hello world" resource string
Merge remote-tracking branch 'origin/master' into search
Merge remote-tracking branch 'origin/master' into search