Merge branch 'master' into user-sort

Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js

plugins/talk-plugin-auth/client/components/ChangeUsername.js

@@ -13,7 +13,7 @@ import {
   invalidForm,
   validForm,
   createUsername
-} from 'coral-framework/actions/auth';
+} from 'coral-embed-stream/src/actions/auth';
 
 class ChangeUsernameContainer extends React.Component {
   constructor(props) {

plugins/talk-plugin-auth/client/components/SignInButton.js

@@ -2,7 +2,7 @@ import React from 'react';
 import {Button} from 'plugin-api/beta/client/components/ui';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
-import {showSignInDialog} from 'coral-framework/actions/auth';
+import {showSignInDialog} from 'coral-embed-stream/src/actions/auth';
 import t from 'coral-framework/services/i18n';
 
 const SignInButton = ({loggedIn, showSignInDialog}) => (

plugins/talk-plugin-auth/client/components/SignInContainer.js

@@ -18,7 +18,7 @@ import {
   facebookCallback,
   invalidForm,
   validForm,
-} from 'coral-framework/actions/auth';
+} from 'coral-embed-stream/src/actions/auth';
 
 class SignInContainer extends React.Component {
   constructor(props) {

plugins/talk-plugin-auth/client/components/UserBox.js

@@ -3,7 +3,7 @@ import styles from './styles.css';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import t from 'coral-framework/services/i18n';
-import {logout} from 'coral-framework/actions/auth';
+import {logout} from 'coral-embed-stream/src/actions/auth';
 
 const UserBox = ({loggedIn, user, logout, onShowProfile}) => (
   <div>

plugins/talk-plugin-featured-comments/client/containers/ModSubscription.js

@@ -21,14 +21,14 @@ class ModSubscription extends React.Component {
           assetId: this.props.data.variables.asset_id,
         },
         updateQuery: (prev, {subscriptionData: {data: {commentFeatured: {user, comment}}}}) => {
-          const notify = this.props.user.id === user.id
+          const notifyText = this.props.user.id === user.id
             ? ''
             : t(
               'talk-plugin-featured-comments.notify_featured',
               user.username,
               prepareNotificationText(comment.body),
             );
-          return this.props.handleCommentChange(prev, comment, notify);
+          return this.props.handleCommentChange(prev, comment, notifyText);
         },
       },
       {