(Issue 303) Functionality is there and existing unit tests adjusted. Needs new tests.
(Issue 303) Added unit tests for a variety of combinations of resourceTypes
(Issue 303) Converted _.each to a _.compact
(Issue 303) Fix intermittent test failures for group indexing test
Merge remote-tracking branch 'mrvisser/issue-303'
Merge branch 'master' of http://github.com/sakaiproject/Hilary
Fixing logical merge conflict w/ master.
Merge branch 'master' into issue-303

Conflicts:
	node_modules/oae-search/tests/test-general-search.js
Merge pull request #303 from mrvisser/issue-303

Create groups + user search feed