(Activity) Initial Activity Impl; Has the glue for the activity framework; User, group, content producers and routers; One simple unit test.
(Activity) Added the actual activity module.
(Activity) Activity progress
Removing JSON.stringify in an assertion.
Merge branch 'master' into activity-poc
Removing use of a fabricated admin context in favour of internal methods that are now available.
(Activity) Completed activity use-cases that can be implemented with current features. Added unit tests for privacy and more advanced routing use cases.
(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.
(Activity) Documentation progress. Promoted propagation out of the activity entity model.
(Activity) Another round of documentation. Self-review remaining.
(Activity) Minor changes from self-review.
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 activity-poc

Conflicts:
	node_modules/oae-content/lib/api.js