Main search should mix categories and users
Merge pull request #172 from krazemon/searchcat

Main search should mix categories and users