move search to navbar
Merge branch 'master' of https://github.com/enginuitygroup/street-smart-client