starting to add search functionality but not yet working
Merge branch 'master' into development_l