Merge branch 'master' into i18n-refactor

Conflicts:
	client/coral-sign-in/components/FakeComment.js
	client/coral-sign-in/components/UserBox.js

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

@@ -0,0 +1,32 @@
+import React from 'react';
+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';
+
+const UserBox = ({loggedIn, user, logout, onShowProfile}) => (
+  <div>
+    {
+      loggedIn ? (
+        <div className={styles.userBox}>
+          {t('sign_in.logged_in_as')}
+          <a onClick={onShowProfile}>{user.username}</a>. {t('sign_in.not_you')}
+          <a className={styles.logout} onClick={() => logout()}>
+            {t('sign_in.logout')}
+          </a>
+        </div>
+      ) : null
+    }
+  </div>
+);
+
+const mapStateToProps = ({auth}) => ({
+  loggedIn: auth.toJS().loggedIn,
+  user: auth.toJS().user
+});
+
+const mapDispatchToProps = (dispatch) =>
+  bindActionCreators({logout}, dispatch);
+
+export default connect(mapStateToProps, mapDispatchToProps)(UserBox);