Merge branch 'master' of github.com:coralproject/talk into install-admin

client/coral-sign-in/components/SignInContent.js

@@ -97,7 +97,7 @@ const SignInContent = ({
 SignInContent.propTypes = {
   auth: PropTypes.shape({
     isLoading: PropTypes.bool.isRequired,
-    error: PropTypes.object,
+    error: PropTypes.string,
     emailVerificationFailure: PropTypes.bool
   }).isRequired,
   fetchSignInFacebook: PropTypes.func.isRequired,

views/article.ejs

@@ -8,6 +8,7 @@
     <meta property="article:published" itemprop="datePublished" content="2016-11-16T11:46:06-05:00" />
     <meta property="article:modified" itemprop="dateModified" content="2016-11-16T12:09:44-05:00" />
     <meta property="article:section" itemprop="articleSection" content="The Section!" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>
       main {
         margin-left:auto;