[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
fix(requirements): update eve-elastic to 0.1.22
feat(search): set explicit elastic mapping for content

SD-1064
fix(mapping): fix genre ingest to match schema

SD-945
fix(backend): make sure we change etag on update

otherwise browser can use cached version of an item
which will appear as locked even after unlocking it

SD-1084
[SD-1066] Added aggregate for urgency
Merge pull request #358 from petrjasek/fix-lock

fix(backend): make sure we change etag on update
fix(unspike): send content to default stage

SD-1102
fix(newsml1.2): fix genre parsing to match schema

SD-945
Merge pull request #356 from superdesk/feat-search

search feature
Merge pull request #360 from petrjasek/fix-unspike

fix(unspike): send content to default stage
feat(prepopulation): Added the option to specify the current logged user for every added doc
feat(search): get aggregations for federated search

SD-1057
Merge pull request #363 from ioanpocol/master

feat(prepopulation): Added the option to specify the current logged user...