#486: Search | User Groups
Merge branch 'master' into bixly-testing