Merge remote-tracking branch 'origin/master'

# Conflicts:
#	bnd2/react/src/pages/welcome.js

bnd2/react/src/pages/welcome.js

@@ -250,20 +250,15 @@ export default class Welcome extends React.Component {
               <Typography variant="h5" component="h2">
                 <span className={classes.link}
                       onClick={openURL.bind(this,
-                        'https://github.com/b3log/baidu-netdisk-downloaderx')}>前往 GitHub</span>
+                        'https://github.com/b3log/baidu-netdisk-downloaderx')}>前往 github</span>
               </Typography>
             </CardContent>
             <CardActions>
-              <Button
-                className={classes.ftOriginal}
-                size="small"
-                onClick={this.share.bind(this)}
-              >
-                <ShareIcon/>
-                分享 BND
-                <input className={classes.copyInput} ref={this.text}
-                       readOnly="{true}"
-                       value={this.state.shareText}/>
+              <Button size="small" className={classes.ftOriginal}
+                      onClick={openURL.bind(this,
+                        'https://hacpai.com/tag/bnd')}>
+                ⚡️
+                浏览 BND 相关讨论
               </Button>
             </CardActions>
           </Card>
@@ -275,27 +270,26 @@ export default class Welcome extends React.Component {
               <Typography variant="h5" className={classes.link}
                           component="h2" onClick={openURL.bind(this,
                 'http://hacpai.com')}>
-                B3log 社区
+                黑客派社区
               </Typography>
             </CardContent>
             <CardActions>
-              <Button size="small" className={classes.ftOriginal}
-                      onClick={openURL.bind(this,
-                        'https://hacpai.com/tag/bnd')}>
-                ⚡️
-                查看 BND 相关文章
+              <Button
+                className={classes.ftOriginal}
+                size="small"
+                onClick={this.share.bind(this)}
+              >
+                <ShareIcon/>
+                分享 BND
+                <input className={classes.copyInput} ref={this.text}
+                       readOnly="{true}"
+                       value={this.state.shareText}/>
               </Button>
             </CardActions>
           </Card>
         </div>
 
         <Card style={{display: this.state.showB3log}}>
-          <CardContent>
-            <Typography color="textSecondary">
-              B3log 社区动态
-            </Typography>
-          </CardContent>
-          <Divider/>
           <Table className={classes.ftOriginal}>
             <TableBody>
               {
@@ -360,4 +354,4 @@ export default class Welcome extends React.Component {
 
 Welcome.propTypes = {
   classes: PropTypes.object.isRequired,
-}
\ No newline at end of file
+}