Merge branch 'master'

Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js

graph/mutators/comment.js

@@ -150,10 +150,8 @@ const createPublicComment = (context, commentInput) => {
             item_id: comment.id,
             item_type: 'COMMENTS',
             action_type: 'FLAG',
-            metadata: {
-              field: 'body',
-              details: 'Matched suspect word filters.'
-            }
+            group_id: 'Matched suspect word filter',
+            metadata: {}
           })
           .then(() => comment);
         }

graph/typeDefs.graphql

@@ -448,7 +448,7 @@ type RootQuery {
   # Comments returned based on a query.
   comments(query: CommentsQuery!): [Comment]
 
-  # Returne the count of comments satisfied by the query. Note that this edge is
+  # Return the count of comments satisfied by the query. Note that this edge is
   # expensive as it is not batched. Requires the `ADMIN` role.
   commentCount(query: CommentCountQuery!): Int