Refactor/es feeds

Mark Hardingrequested to merge
refactor/es-feeds into master

TODO:

  • Re-introduce block client side
  • Re-synchronise entities in the background

Merge request reports