search bar added
Merge branch 'master' into feature/search