Structured comments take 1
Merge branch 'master' of github.com:guardian/frontend into structured-comments
Merge branch 'master' of github.com:guardian/frontend into structured-comments

Conflicts:
	discussion/app/controllers/CommentsController.scala
	discussion/app/discussion/DiscussionApi.scala
Merge pull request #4964 from guardian/structured-comments

Structured comments take 1