when we're hiding comments client-side, hide blocked comments first
Merge branch 'master' of github.com:guardian/frontend into discussion-hide-blocked

* 'master' of github.com:guardian/frontend: (89 commits)
  tweaking comment recommend alignment on mobile
  Stop renderering of two comment boxes
  Ordering of comments preference now saved
  Align class with Collection class
  Update segment size and offset as per request
  Added switch for new Ophan JS
  formatting of required modules' names
  Add implicits.Dates to tests that used the old package implicits
  adding a cache time if facia returns 404
  Change to use AWSCredentialsProvider
  better regex matching
  remove dev subdomain too
  Small style change to comment ordering control
  Refactoring - creating BlankComment
  Removed Body Linkng AB tests.
  Add feature test for new tonal rules
  Ensure that comment always takes precedent before feature when selecting tone
  Avoid divide by zero
  Fix tests in TemplateDedupingTests to use only Seq Trail Fix missing apply method
  A few niggly bits on the comment sorting UI and type changes
  ...

Conflicts:
	discussion/app/views/fragments/commentsBody.scala.html
fixing formatting
css readability
Merge pull request #2704 from guardian/discussion-hide-blocked

Discussion hide blocked