search feature done
Merge branch 'search' into dev