Merge pull request #1647 from LLK/release/2.2.26

[Develop] Release 2.2.26

src/views/credits/credits.jsx

@@ -157,7 +157,7 @@ var Credits = React.createClass({
                     </li>
 
                     <li>
-                        <img src="//cdn2.scratch.mit.edu/get_image/user/default_60x60.png" alt="Joel Avatar" />
+                        <img src="//cdn2.scratch.mit.edu/get_image/user/26249744_60x60.png" alt="Joel Avatar" />
                         <span className="name">Joel Gritter</span>
                     </li>
 

src/views/messages/container.jsx

@@ -131,7 +131,7 @@ var Messages = React.createClass({
                 messages={this.props.messages}
                 adminMessages={this.props.adminMessages}
                 scratcherInvite={this.props.invite}
-                numNewMessages={this.props.numNewSocialMessages}
+                numNewMessages={this.props.numNewMessages}
                 handleFilterClick={this.handleFilterClick}
                 handleAdminDismiss={this.handleMessageDismiss}
                 loadMore={loadMore}