fix some bugs
Add services for search
Add search
Search works now))
Fixed merge conflicts
Fixed menu bug in search page
fixed small bugs
Merge branch 'master' into roma
merge conflict