[SD-1066] Added aggregations, the new facets
[SD-1066] Added aggregations, the new facets
[SD-1066] fix the category facet
[SD-1066] add aggregates/facets to user content response
[SD-1066] add remove facets they are now replaced by aggregates
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	apps/content.py
	requirements.txt
fix flake errors