Search result and all search - ready to push
Merge branch 'search' into dev