(Issue 284) Consolidating 'title' and 'name' terminology to displayName for groups, content and search
(Issue 284) Changing how '_extra' field on search documents is handled. Honour 'extra' field of users
(Issue 284) Disabling _source on resource index.
Revert description to not be the ternary operation anymore.
Removing _type off the view model. Removing general and sort fields from users when converting user object back to search document for view.
Merge branch 'master' into issue-284

Conflicts:
	node_modules/oae-content/lib/rest.js
	node_modules/oae-search/lib/util.js
(Issue 290) Add ability to disable 'indirect access' in general search using 'includeIndirect' option.
(Issue 290) Removing a stray if statement that snuck in and caused a weird bug. Also some opt-handling clean-up.
(Issue 290) Improving general search test documentation
Merge branch 'master' into issue-290

Conflicts:
	node_modules/oae-search/lib/util.js
	node_modules/oae-search/tests/test-general-search.js
Merge branch 'master' into issue-284

Conflicts:
	node_modules/oae-principals/lib/api.group.js
	node_modules/oae-principals/lib/internal/dao.js
	node_modules/oae-principals/lib/model.group.js
	node_modules/oae-principals/lib/search.js
	node_modules/oae-search/tests/test-general-search.js
Merge branch 'master' into issue-284

Conflicts:
	node_modules/oae-search/lib/api.js
(Issue #290) Better documenting the params option.
Merge branch 'issue-290' of git://github.com/mrvisser/Hilary into issue-290
Removed trailing spaces
Merge remote-tracking branch 'sakaiproject/master' into hooks

Conflicts:
	node_modules/oae-content/lib/searches/library.js
	node_modules/oae-principals/lib/search.js
	node_modules/oae-principals/lib/searches/members.js
	node_modules/oae-principals/lib/searches/memberships.js
	node_modules/oae-search/lib/util.js
	node_modules/oae-search/tests/test-general-search.js