diff --git a/Makefile b/Makefile
index 2a01d279cd..e9852d8c3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 VERSION     = $(shell head -n 1 VERSION)
 XUANPATH    = $(shell head -n 1 XUANPATH)
 XUANVERSION = $(shell head -n 1 XUANVERSION)
+XVERSION    = $(strip $(subst v,, $(XUANVERSION)))
 
 all: pms
 clean:
@@ -75,6 +76,8 @@ zentaoxx:
 	mkdir zentaoxx/db/
 	cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/
 	rm -rf zentaoxx/db_bak/
+	sed -i 's/xxbVersion/$(XVERSION)/g' zentaoxx/config/ext/xuanxuan.php
+	sed -i "/\$$config->xuanxuan->backend /c\\\$$config->xuanxuan->backend     = 'zentao';" zentaoxx/config/ext/xuanxuan.php
 	sed -i 's/site,//' zentaoxx/module/chat/model.php
 	sed -i 's/admin, g/g/' zentaoxx/module/chat/model.php
 	sed -i '/password = md5/d' zentaoxx/module/chat/control.php
diff --git a/db/zentao.sql b/db/zentao.sql
index 848a4e137d..046cb8230a 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -567,6 +567,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
   `status` enum('','changed','active','draft','closed') NOT NULL default '',
   `color` char(7) NOT NULL,
   `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released', 'closed') NOT NULL DEFAULT 'wait',
+  `stagedBy` char(30) NOT NULL,
   `mailto` text,
   `openedBy` varchar(30) NOT NULL default '',
   `openedDate` datetime NOT NULL,
@@ -604,6 +605,7 @@ CREATE TABLE IF NOT EXISTS `zt_storystage` (
   `story` mediumint(8) unsigned NOT NULL,
   `branch` mediumint(8) unsigned NOT NULL,
   `stage` varchar(50) NOT NULL,
+  `stagedBy` char(30) NOT NULL,
   UNIQUE KEY `story_branch` (`story`,`branch`),
   KEY `story` (`story`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/module/task/control.php b/module/task/control.php
index c33865056a..34f58c79de 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1335,7 +1335,7 @@ class task extends control
             if(!$this->session->taskWithChildren and $tasks)
             {
                 $children = $this->dao->select('*')->from(TABLE_TASK)->where('deleted')->eq(0)
-                    ->andWhere('parent')->ne(0)
+                    ->andWhere('parent')->gt(0)
                     ->andWhere('parent', true)->in(array_keys($tasks))
                     ->beginIF($this->post->exportType == 'selected')->orWhere('id')->in($this->cookie->checkedItem)->fi()
                     ->markRight(1)
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 65cf7e84e2..0d9b20a59d 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -35,6 +35,7 @@
         </div>
         <div class='detail-content'><?php echo $todo->desc;?></div>
       </div>
+      <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=todo&objectID=$todo->id");?>
       <?php include '../../common/view/action.html.php';?>
     </div>
     <div class='main-actions'>
@@ -45,8 +46,6 @@
         common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
         common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
 
-        if(common::hasPriv('action', 'comment', $todo)) echo html::a('#commentModal', '<i class="icon-chat-line"></i>', '', "title='{$lang->comment}' data-toggle='modal' class='btn'");
-
         if($this->session->todoList)
         {
             $browseLink = $this->session->todoList;
@@ -171,22 +170,6 @@
 <div id="mainActions" class='main-actions'>
   <div class="container"></div>
 </div>
-<div class="modal fade" id="commentModal">
-  <div class="modal-dialog mw-600px">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
-        <h4 class="modal-title"><?php echo $lang->comment;?></h4>
-      </div>
-      <div class="modal-body">
-        <form method='post' action='<?php echo $this->createLink('action', 'comment', "objectType=todo&objectID=$todo->id")?>' target='hiddenwin'>
-          <div class="form-group"><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></div>
-          <div class='text-center'><?php echo html::submitButton();?></div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
 <div class="modal fade" id="projectModal">
   <div class="modal-dialog mw-500px">
     <div class="modal-content">
@@ -243,6 +226,6 @@
 <?php echo $lang->todo->thisIsPrivate;?>
 <?php endif;?>
 <script>
-    $(function() { parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
+$(function() {parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/xuanxuan/module/admin/ext/control/xuanxuan.php b/xuanxuan/module/admin/ext/control/xuanxuan.php
index db62eda02e..37f5a5a983 100644
--- a/xuanxuan/module/admin/ext/control/xuanxuan.php
+++ b/xuanxuan/module/admin/ext/control/xuanxuan.php
@@ -24,7 +24,7 @@ class admin extends control
                 if(empty($setting->sslkey)) $errors['sslkey'] = $this->lang->chat->errorSSLKey;
             }
 
-            if(strpos($setting->server, '127.0.0.1') !== false) $errors[] = $this->lang->chat->xxdServerError;
+            if($setting->turnon and strpos($setting->server, '127.0.0.1') !== false) $errors[] = $this->lang->chat->xxdServerError;
             if(strpos($setting->server, 'https://') !== 0 and strpos($setting->server, 'http://') !== 0) $errors[] = $this->lang->chat->xxdSchemeError;
             if(empty($setting->server)) $errors[] = $this->lang->chat->xxdServerEmpty;
 
diff --git a/xuanxuan/module/admin/ext/view/xuanxuan.html.php b/xuanxuan/module/admin/ext/view/xuanxuan.html.php
index 7cd361c466..2bc42f885f 100644
--- a/xuanxuan/module/admin/ext/view/xuanxuan.html.php
+++ b/xuanxuan/module/admin/ext/view/xuanxuan.html.php
@@ -34,7 +34,11 @@
         </tr>
         <tr>
           <th><?php echo $lang->chat->key;?></th>
-          <td><?php echo zget($config->xuanxuan, 'key', '');?></td>
+          <td>
+            <?php $key = zget($config->xuanxuan, 'key', '');?>
+            <?php echo $type == 'edit' ? html::input('key', $key, "class='form-control' readonly='readonly'") : $key;?>
+          </td>
+          <td><?php echo $type == 'edit' ? html::a('javascript:void(0)', $lang->chat->createKey, '', 'onclick="createKey()"') : '';?></td>
         </tr>
         <tr>
           <th><?php echo $lang->chat->debug;?></th>
@@ -116,8 +120,9 @@
               <?php echo html::submitButton();?>
               <?php echo html::a(helper::createLink('admin', 'xuanxuan'), $lang->goback, '', 'class="btn" style="min-width: 120px"');?>
             <?php else:?>
-              <?php echo html::a(helper::createLink('admin', 'downloadXXD', 'type=package'), $lang->chat->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package'");?>
-              <?php echo html::a(helper::createLink('admin', 'downloadXXD', 'type=config'), $lang->chat->downloadConfig, 'hiddenwin', "class='btn btn-primary download'");?>
+              <?php $disabled = $config->xuanxuan->turnon ? '' : 'disabled';?>
+              <?php echo html::a(helper::createLink('admin', 'downloadXXD', 'type=package'), $lang->chat->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package $disabled'");?>
+              <?php echo html::a(helper::createLink('admin', 'downloadXXD', 'type=config'), $lang->chat->downloadConfig, 'hiddenwin', "class='btn btn-primary download $disabled'");?>
               <?php echo html::a(helper::createLink('admin', 'xuanxuan', 'type=edit'), $lang->chat->changeSetting, '', "class='btn'");?>
               <?php echo html::a('http://www.zentao.net/book/zentaopmshelp/302.html', $lang->chat->help, '_blank', "class='btn'");?>
             <?php endif;?>
diff --git a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
index 3d1336ce2d..70eb7b4657 100644
--- a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
@@ -25,7 +25,7 @@ $lang->chat->turnonList[0] = 'Disable';
 
 $lang->chat->info            = "ZenTao client is powered by <a href='https://xuan.im/' target='_blank'>Xuan</a>, a secure and open source Instant Messenger by Nature Easy Soft. It is a self-hosted and cross-platform tool with numerous plug-ins and robust features. In Xuan, you can code your own plug-ins. Click <a href='https://xuan.im/' target='_blank'>HERE</a> for more.";
 $lang->chat->xxClientConfirm = 'Click Download ZenTao Client at the right bottom to download it!';
-$lang->chat->xxServerConfirm = 'Go to Admin-Integrate-ZT Client to download the ZenTao Client Server!';
+$lang->chat->xxServerConfirm = 'Go to Admin-ZT Client to download the ZenTao Client Server!';
 
 $lang->chat->xxdServerTip   = 'XXD server address contains protocol, host and port，such as http://192.168.1.35 or http://pms.zentao.com. It should not be 127.0.0.1.';
 $lang->chat->xxdServerEmpty = 'XXD server address is empty.';
diff --git a/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
index 91a001b097..219f0c6a1b 100644
--- a/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
@@ -25,7 +25,7 @@ $lang->chat->turnonList[0] = '否';
 
 $lang->chat->info            = "禅道客户端由易软天创旗下另外一款免费、开源、安全的IM产品<a href='https://xuan.im/' target='_blank'>喧喧</a>驱动，支持私有部署，跨平台操作，内置大量插件，功能丰富，在喧喧里，您甚至还可以为自己编写个性化的插件，<a href='https://xuan.im/' target='_blank'>点击查看</a>。";
 $lang->chat->xxClientConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！点击界面右下角下载禅道客户端。';
-$lang->chat->xxServerConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！进入后台-集成-客户端集成进行下载配置。';
+$lang->chat->xxServerConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！进入后台-客户端集成进行下载配置。';
 
 $lang->chat->xxdServerTip    = '禅道服务器地址为完整的协议+地址+端口，示例：http://192.168.1.35 或 http://pms.zentao.com ，不能使用127.0.0.1。';
 $lang->chat->xxdServerEmpty  = '禅道服务器地址为空。';