diff --git a/Makefile b/Makefile
index 29150c6eb1..78d326d062 100644
--- a/Makefile
+++ b/Makefile
@@ -53,33 +53,38 @@ zentaoxx:
 	cd $(XUANPATH); git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip
 	mv $(XUANPATH)/xuan.zip .
 	unzip xuan.zip
-	cp xuan/ranzhi/config/ext/xuanxuan.php zentaoxx/config/ext/
-	cp -r xuan/ranzhi/lib/phpaes zentaoxx/lib/
-	cp -r xuan/ranzhi/framework/xuanxuan.class.php zentaoxx/framework/
-	cp -r xuan/ranzhi/db/*.sql zentaoxx/db/
-	cp -r xuan/ranzhi/app/sys/chat zentaoxx/module/
-	cp -r xuan/ranzhi/app/sys/common/ext/model/hook zentaoxx/module/common/ext/model/
-	cp -r xuan/ranzhi/app/sys/action zentaoxx/module/
+	cp xuan/xxb/config/ext/xuanxuan.php zentaoxx/config/ext/
+	cp -r xuan/xxb/lib/phpaes zentaoxx/lib/
+	cp -r xuan/xxb/framework/xuanxuan.class.php zentaoxx/framework/
+	cp -r xuan/xxb/db/*.sql zentaoxx/db/
+	cp -r xuan/xxb/module/chat zentaoxx/module/
+	cp -r xuan/xxb/module/client zentaoxx/module/
+	cp -r xuan/xxb/module/common/ext/model/hook zentaoxx/module/common/ext/model/
+	mkdir zentaoxx/module/action
+	cp -r xuan/xxb/module/action/ext zentaoxx/module/action
 	cp -r xuanxuan/config/* zentaoxx/config/
 	cp -r xuanxuan/module/* zentaoxx/module/
 	cp -r xuanxuan/www/* zentaoxx/www/
+	mv zentaoxx/db/ zentaoxx/db_bak
+	mkdir zentaoxx/db/
+	cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/
+	rm -rf zentaoxx/db_bak/
 	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
 	sed -i '/getSignedTime/d' zentaoxx/module/chat/control.php
-	sed -i 's/tree/dept/' zentaoxx/module/chat/control.php
+	sed -i "s/'yahoo', //g" zentaoxx/module/chat/config.php
+	sed -i "s/'gtalk', //g" zentaoxx/module/chat/config.php
+	sed -i "s/'wangwang', //g" zentaoxx/module/chat/config.php
+	sed -i "s/'site', //g" zentaoxx/module/chat/config.php
+	sed -i "s/'reload'/inlink('browse')/g" zentaoxx/module/client/control.php
 	sed -i 's/tree/dept/' zentaoxx/module/chat/model.php
-	sed -i "s/, 'sys'//" zentaoxx/module/chat/control.php
-	sed -i 's/system.sys/system/' zentaoxx/module/chat/control.php
-	sed -i 's/&app=sys//' zentaoxx/module/chat/control.php
-	sed -i 's/file->createdBy/file->addedBy/' zentaoxx/module/chat/control.php
-	sed -i 's/file->createdDate/file->addedDate/' zentaoxx/module/chat/control.php
 	sed -i 's/im_/zt_im_/' zentaoxx/db/*.sql
-	sed -i 's/sys_user/zt_user/' zentaoxx/db/*.sql
-	sed -i 's/sys_file/zt_file/' zentaoxx/db/*.sql
-	sed -i '/sys_entry/d' zentaoxx/db/*.sql
+	sed -i 's/xxb_user/zt_user/' zentaoxx/db/*.sql
+	sed -i 's/xxb_file/zt_file/' zentaoxx/db/*.sql
+	sed -i '/xxb_entry/d' zentaoxx/db/*.sql
 	mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php
-	rm -rf zentaopms/tools
+	rm -rf zentaoxx/tools
 	zip -rqm -9 zentaoxx.$(VERSION).zip zentaoxx/*
 	rm -rf xuan.zip xuan zentaoxx
 package:
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 3b0376cdec..8e2f490b55 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -95,9 +95,6 @@ $lang->bug->reportChart        = 'Report';
 $lang->bug->export             = 'Export';
 $lang->bug->delete             = 'Delete';
 $lang->bug->deleted            = 'Deleted';
-$lang->bug->saveTemplate       = 'Save as Template';
-$lang->bug->setPublic          = 'Set as Public Template';
-$lang->bug->deleteTemplate     = 'Delete Template';
 $lang->bug->confirmStoryChange = 'Confirm Story Change';
 $lang->bug->copy               = 'Copy';
 $lang->bug->search             = 'Search';
@@ -163,11 +160,8 @@ $lang->bug->buttonConfirm = 'Confirm';
 $lang->bug->summary               = "Bugs on this page : <strong>%s</strong> Total, <strong>%s</strong> Unresolved.";
 $lang->bug->confirmChangeProduct  = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}, Story and Task change. Do you want to do this?";
 $lang->bug->confirmDelete         = 'Do you want to delete this bug?';
-$lang->bug->setTemplateTitle      = 'Please enter the title of template.';
 $lang->bug->remindTask            = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?';
 $lang->bug->skipClose             = 'Bug %s is not resolved. You cannot close it.';
-$lang->bug->applyTemplate         = 'Template';
-$lang->bug->confirmDeleteTemplate = 'Do you want to delete this template?';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[Steps]</p><br/>";
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index ef6493b062..793317b8eb 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -95,9 +95,6 @@ $lang->bug->reportChart        = '報表統計';
 $lang->bug->export             = '導出數據';
 $lang->bug->delete             = '刪除';
 $lang->bug->deleted            = '已刪除';
-$lang->bug->saveTemplate       = '保存模板';
-$lang->bug->setPublic          = '設為公共模板';
-$lang->bug->deleteTemplate     = '刪除模板';
 $lang->bug->confirmStoryChange = '確認需求變動';
 $lang->bug->copy               = '複製Bug';
 $lang->bug->search             = '搜索';
@@ -163,11 +160,8 @@ $lang->bug->buttonConfirm = '確認';
 $lang->bug->summary               = "本頁共 <strong>%s</strong> 個Bug，未解決 <strong>%s</strong>。";
 $lang->bug->confirmChangeProduct  = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、需求和任務發生變化，確定嗎？";
 $lang->bug->confirmDelete         = '您確認要刪除該Bug嗎？';
-$lang->bug->setTemplateTitle      = '請輸入bug模板標題';
 $lang->bug->remindTask            = '該Bug已經轉化為任務，是否更新任務(編號:%s)狀態 ?';
 $lang->bug->skipClose             = 'Bug %s 不是已解決狀態，不能關閉。';
-$lang->bug->applyTemplate         = '應用模板';
-$lang->bug->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步驟]</p><br/>";
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 08f1361331..073c6ceb58 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -94,12 +94,19 @@ $lang->preShortcutKey  = '[Shortcut:←]';
 $lang->nextShortcutKey = '[Shortcut:→]';
 $lang->backShortcutKey = '[Shortcut:Alt+↑]';
 
+$lang->saveTemplate          = 'Save as Template';
+$lang->setPublic             = 'Set as Public Template';
+$lang->deleteTemplate        = 'Delete Template';
+$lang->setTemplateTitle      = 'Please enter the title of template.';
+$lang->applyTemplate         = 'Template';
+$lang->confirmDeleteTemplate = 'Do you want to delete this template?';
+
 $lang->select        = 'Select';
 $lang->selectAll     = 'Select All';
 $lang->selectReverse = 'Select Inverse';
 $lang->loading       = 'Loading...';
 $lang->notFound      = 'Not found!';
-$lang->notPage       =  'Sorry, the features you are visiting are under development!';
+$lang->notPage       = 'Sorry, the features you are visiting are under development!';
 $lang->showAll       = '[[Show All]]';
 
 $lang->future       = 'Pending';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index d2bdf9b35a..84a4325f05 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -94,6 +94,13 @@ $lang->preShortcutKey  = '[快捷鍵:←]';
 $lang->nextShortcutKey = '[快捷鍵:→]';
 $lang->backShortcutKey = '[快捷鍵:Alt+↑]';
 
+$lang->saveTemplate          = '保存模板';
+$lang->setPublic             = '設為公共模板';
+$lang->deleteTemplate        = '刪除模板';
+$lang->setTemplateTitle      = '請輸入模板標題';
+$lang->applyTemplate         = '應用模板';
+$lang->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
+
 $lang->select        = '選擇';
 $lang->selectAll     = '全選';
 $lang->selectReverse = '反選';
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 5521aabe17..a989b9052e 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -41,7 +41,6 @@ $lang->misc->zentao->support['manual']     = "User Manual";
 
 
 
-
 $lang->misc->zentao->cowin['reportbug']    = "Report Bug ";
 $lang->misc->zentao->cowin['feedback']     = "Feedback";
 
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 7126100538..a2dd2544cc 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -41,7 +41,6 @@ $lang->misc->zentao->support['ask']        = "官方問答";
 $lang->misc->zentao->support['video']      = "使用視頻";
 $lang->misc->zentao->support['qqgroup']    = "官方QQ群";
 
-$lang->misc->zentao->cowin['donate']       = "捐助我們";
 $lang->misc->zentao->cowin['reportbug']    = "彙報Bug";
 $lang->misc->zentao->cowin['feedback']     = "反饋需求";
 $lang->misc->zentao->cowin['recommend']    = "推薦給朋友";
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 9b1a00a93f..15df952193 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -274,3 +274,8 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '關閉原因';
 
 $lang->task->report->finishedTasksPerDay->type             = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期';
+
+$lang->task->action = new stdclass();
+$lang->task->action->batchcreate = array('main' => '$date, 由 <strong>$actor</strong> 創建子任務 。');
+$lang->task->action->unlink      = array('main' => '$date, 由 <strong>$actor</strong> 取消關聯父任務 。');
+$lang->task->action->linkto      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到父任務 。');
diff --git a/module/tree/model.php b/module/tree/model.php
index a023e06342..b0aeeb7baa 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -1684,7 +1684,7 @@ class treeModel extends model
      */
     public function getDocStructure()
     {
-        $stmt = $this->dbh->query($this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('doc')->andWhere('deleted')->eq(0)->orderBy('`order`')->get());
+        $stmt = $this->dbh->query($this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('doc')->andWhere('deleted')->eq(0)->orderBy('`grade`_desc, `order`')->get());
         $parent = array();
         while($module = $stmt->fetch())
         {
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index edc1647901..9080cdb5b9 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -374,6 +374,18 @@ class upgradeModel extends model
         case '11_4':
             $this->saveLogs('Execute 11_4');
             $this->execSQL($this->getUpgradeFile('11.4'));
+        case '11_4_1':
+            $this->saveLogs('Execute 11_4');
+            if(!isset($this->config->isINT) or !($this->config->isINT))
+            {
+                if(!$executeXuanxuan)
+                {
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.4.0.sql';
+                    $this->execSQL($xuanxuanSql);
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.5.0.sql';
+                    $this->execSQL($xuanxuanSql);
+                }
+            }
         }
 
         $this->deletePatch();
@@ -506,6 +518,14 @@ class upgradeModel extends model
             case '11_2': $confirmContent .= file_get_contents($this->getUpgradeFile('11.2'));
             case '11_3': $confirmContent .= file_get_contents($this->getUpgradeFile('11.3'));
             case '11_4': $confirmContent .= file_get_contents($this->getUpgradeFile('11.4'));
+            case '11_4_1':
+                if(!isset($this->config->isINT) or !($this->config->isINT))
+                {
+                    $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.4.0.sql';
+                    $confirmContent .= file_get_contents($xuanxuanSql);
+                    $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.5.0.sql';
+                    $confirmContent .= file_get_contents($xuanxuanSql);
+                }
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 45cc704fc6..08ab754eda 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -48,27 +48,28 @@ $lang->user->originalPassword = '原密碼';
 $lang->user->verifyPassword   = '您的系統登錄密碼';
 $lang->user->resetPassword    = '忘記密碼';
 
-$lang->user->index           = "用戶視圖首頁";
-$lang->user->view            = "用戶詳情";
-$lang->user->create          = "添加用戶";
-$lang->user->batchCreate     = "批量添加用戶";
-$lang->user->edit            = "編輯用戶";
-$lang->user->batchEdit       = "批量編輯";
-$lang->user->unlock          = "解鎖用戶";
-$lang->user->delete          = "刪除用戶";
-$lang->user->unbind          = "解除然之綁定";
-$lang->user->login           = "用戶登錄";
-$lang->user->mobileLogin     = "手機訪問";
-$lang->user->editProfile     = "修改檔案";
-$lang->user->deny            = "訪問受限";
-$lang->user->confirmDelete   = "您確定刪除該用戶嗎？";
-$lang->user->confirmUnlock   = "您確定解除該用戶的鎖定狀態嗎？";
-$lang->user->confirmUnbind   = "您確定解除該用戶跟然之的綁定嗎？";
-$lang->user->relogin         = "重新登錄";
-$lang->user->asGuest         = "遊客訪問";
-$lang->user->goback          = "返回前一頁";
-$lang->user->deleted         = '(已刪除)';
-$lang->user->search          = '搜索';
+$lang->user->index             = "用戶視圖首頁";
+$lang->user->view              = "用戶詳情";
+$lang->user->create            = "添加用戶";
+$lang->user->batchCreate       = "批量添加用戶";
+$lang->user->edit              = "編輯用戶";
+$lang->user->batchEdit         = "批量編輯";
+$lang->user->unlock            = "解鎖用戶";
+$lang->user->delete            = "刪除用戶";
+$lang->user->unbind            = "解除然之綁定";
+$lang->user->login             = "用戶登錄";
+$lang->user->mobileLogin       = "手機訪問";
+$lang->user->editProfile       = "修改檔案";
+$lang->user->deny              = "訪問受限";
+$lang->user->confirmDelete     = "您確定刪除該用戶嗎？";
+$lang->user->confirmUnlock     = "您確定解除該用戶的鎖定狀態嗎？";
+$lang->user->confirmUnbind     = "您確定解除該用戶跟然之的綁定嗎？";
+$lang->user->relogin           = "重新登錄";
+$lang->user->asGuest           = "遊客訪問";
+$lang->user->goback            = "返回前一頁";
+$lang->user->deleted           = '(已刪除)';
+$lang->user->search            = '搜索';
+$lang->user->setPublicTemplate = '設為公共模板';
 
 $lang->user->profile     = '檔案';
 $lang->user->project     = $lang->projectCommon;
diff --git a/xuanxuan/module/admin/ext/control/downloadxxd.php b/xuanxuan/module/admin/ext/control/downloadxxd.php
index c3c605ce4e..df9b331b3f 100644
--- a/xuanxuan/module/admin/ext/control/downloadxxd.php
+++ b/xuanxuan/module/admin/ext/control/downloadxxd.php
@@ -9,9 +9,11 @@ class admin extends control
             $server = $this->chat->getServer('zentao');
             if(strpos($server, '127.0.0.1') !== false) die(js::alert($this->lang->chat->xxdServerError));
 
+            $this->loadModel('setting')->setItem('system.common.xxserver.installed', 1);
+
             $setting     = $this->config->xuanxuan;
             $setting->os = $os;
-            $this->chat->downloadXXD('zentao', $setting, $type);
+            $this->chat->downloadXXD($setting, $type);
         }
         die("Params error.");
     }
diff --git a/xuanxuan/module/admin/ext/control/xuanxuan.php b/xuanxuan/module/admin/ext/control/xuanxuan.php
index b143f60786..db62eda02e 100644
--- a/xuanxuan/module/admin/ext/control/xuanxuan.php
+++ b/xuanxuan/module/admin/ext/control/xuanxuan.php
@@ -10,6 +10,7 @@ class admin extends control
     public function xuanxuan($type = '')
     {
         $this->app->loadLang('chat');
+        $this->app->loadLang('client');
         if($_POST)
         {
             $setting = fixer::input('post')->join('staff', ',')->remove('https')->get();
diff --git a/xuanxuan/module/admin/ext/view/xuanxuan.html.php b/xuanxuan/module/admin/ext/view/xuanxuan.html.php
index 2505783ecc..9ec1686f30 100644
--- a/xuanxuan/module/admin/ext/view/xuanxuan.html.php
+++ b/xuanxuan/module/admin/ext/view/xuanxuan.html.php
@@ -73,7 +73,7 @@
         </tr>
         <?php if($type == 'edit'):?>
         <tr>
-          <th><?php echo $lang->chat->xxd->isHttps;?></th>
+          <th><?php echo $lang->chat->xxdIsHttps;?></th>
           <td>
             <?php echo html::hidden('isHttps', $isHttps);?>
             <?php echo $type ? html::radio('https', $lang->chat->httpsOptions, $isHttps, "class='checkbox'") : $lang->chat->httpsOptions[$isHttps];?>
@@ -82,7 +82,7 @@
         </tr>
         <?php else:?>
         <tr>
-          <th><?php echo $lang->chat->xxd->isHttps;?></th>
+          <th><?php echo $lang->chat->xxdIsHttps;?></th>
           <td><?php echo zget($lang->chat->httpsOptions, $isHttps, '');?> </td>
           <td></td>
         </tr>
@@ -114,6 +114,7 @@
               <?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 echo html::a(helper::createLink('admin', 'xuanxuan', 'type=edit'), $lang->chat->changeSetting, '', "class='btn'");?>
+              <?php echo html::a(helper::createLink('client', 'browse'), $lang->client->browseVersion, '', "class='btn'");?>
               <?php echo html::a('http://www.zentao.net/book/zentaopmshelp/302.html', $lang->chat->help, '_blank', "class='btn'");?>
             <?php endif;?>
           </td>
diff --git a/xuanxuan/module/chat/ext/control/login.php b/xuanxuan/module/chat/ext/control/login.php
index 4423927e54..6eda3c9287 100755
--- a/xuanxuan/module/chat/ext/control/login.php
+++ b/xuanxuan/module/chat/ext/control/login.php
@@ -3,7 +3,7 @@ include '../../control.php';
 
 class myChat extends chat 
 {
-    public function login($account = '', $password = '', $status = '', $userID = 0, $version = '')
+    public function login($account = '', $password = '', $status = '', $userID = 0, $version = '', $device = 'desktop')
     {
         if(!isset($this->config->xuanxuan->turnon) or $this->config->xuanxuan->turnon != 1) die;
         parent::login($account, $password, $status, $userID, $version);
diff --git a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
index 7c5397821b..3d1336ce2d 100644
--- a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
@@ -17,6 +17,8 @@ $lang->chat->createStory = 'Create Story';
 $lang->chat->createTask  = 'Create Task';
 $lang->chat->createTodo  = 'Create Todo';
 
+$lang->chat->xxdIsHttps = 'Enable HTTPS';
+
 $lang->chat->turnonList = array();
 $lang->chat->turnonList[1] = 'Enable';
 $lang->chat->turnonList[0] = 'Disable';
diff --git a/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
index c60224f9d0..91a001b097 100644
--- a/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
@@ -17,6 +17,8 @@ $lang->chat->createStory = '创建需求';
 $lang->chat->createTask  = '创建任务';
 $lang->chat->createTodo  = '创建待办';
 
+$lang->chat->xxdIsHttps = '启用HTTPS';
+
 $lang->chat->turnonList = array();
 $lang->chat->turnonList[1] = '是';
 $lang->chat->turnonList[0] = '否';
diff --git a/xuanxuan/module/client/ext/js/common/xuanxuan.js b/xuanxuan/module/client/ext/js/common/xuanxuan.js
new file mode 100644
index 0000000000..8276df8068
--- /dev/null
+++ b/xuanxuan/module/client/ext/js/common/xuanxuan.js
@@ -0,0 +1,4 @@
+$(function()
+{
+	$('#ajaxForm').ajaxForm();
+})
\ No newline at end of file
diff --git a/xuanxuan/module/client/ext/lang/en/xuanxuan.php b/xuanxuan/module/client/ext/lang/en/xuanxuan.php
new file mode 100644
index 0000000000..df625e8f19
--- /dev/null
+++ b/xuanxuan/module/client/ext/lang/en/xuanxuan.php
@@ -0,0 +1,4 @@
+<?php
+$lang->client->menu = $lang->admin->menu;
+
+$lang->client->browseVersion = 'Browse Version';
diff --git a/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php
new file mode 100644
index 0000000000..5de92c78a6
--- /dev/null
+++ b/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php
@@ -0,0 +1,4 @@
+<?php
+$lang->client->menu = $lang->admin->menu;
+
+$lang->client->browseVersion = '版本列表';
diff --git a/xuanxuan/module/client/ext/view/browse.html.php b/xuanxuan/module/client/ext/view/browse.html.php
new file mode 100644
index 0000000000..0ed90c7304
--- /dev/null
+++ b/xuanxuan/module/client/ext/view/browse.html.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * The browse view file of client module of XXB.
+ *
+ * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Memory <lvtao@cnezsoft.com>
+ * @package     client
+ * @version     $Id$
+ * @link        http://xuan.im
+ */
+?>
+<?php include '../../../common/view/header.html.php';?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('sso');?></div>
+  <div class="btn-toolbar pull-right"><?php common::printLink('admin', 'xuanxuan', '', $lang->goback, '', "class='btn'");?></div>
+</div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <div class='pull-right'><?php common::printLink('client', 'create', '', $lang->client->create, '', "class='btn btn-primary' data-toggle='modal'");?></div>
+    <div class='heading'>
+      <h4><?php echo $lang->client->browseVersion;?></h4>
+    </div>
+  </div>
+  <table class='table table-hover'>
+    <thead>
+    <tr class="text-center">
+      <th class="w-80px"><?php echo $lang->client->id?></th>
+      <th class="w-150px"><?php echo $lang->client->version?></th>
+      <th class="text-left"><?php echo $lang->client->desc?></th>
+      <th class="w-150px"><?php echo $lang->client->strategy?></th>
+      <th class="w-150px"><?php echo $lang->client->releaseStatus?></th>
+      <th class="w-120px"><?php echo $lang->actions?></th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php foreach($clients as $client):?>
+    <tr class="text-center">
+      <td><?php echo $client->id?></td>
+      <td><?php echo $client->version?></td>
+      <td class="text-left" title='<?php echo $client->desc;?>'><?php echo $client->desc?></td>
+      <td><?php echo $lang->client->strategies[$client->strategy]?></td>
+      <td><?php echo $lang->client->status[$client->status]?></td>
+      <td>
+        <?php commonModel::printLink('client', 'edit', "id={$client->id}", $lang->edit, '', "data-toggle='modal'");?>
+        <?php commonModel::printLink('client', 'delete', "id={$client->id}", $lang->delete, '', "class='deleter'");?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+    </tbody>
+  </table>
+</div>
+<script>
+$(function()
+{
+    $(document).on('click', '.deleter', function()
+    {
+        if(confirm('<?php echo $lang->confirmDelete?>'))
+        {
+            $.getJSON(deleter.attr('href'), function(data) 
+            {
+                if(data.result != 'success') alert(data.message);
+                return location.reload();
+            });
+        }
+        return false;
+    });
+
+})
+</script>
+<?php include '../../../common/view/footer.html.php';?>
diff --git a/xuanxuan/module/common/ext/lang/en/xuanxuan.php b/xuanxuan/module/common/ext/lang/en/xuanxuan.php
index dc9907ee02..4d976ec215 100644
--- a/xuanxuan/module/common/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/common/ext/lang/en/xuanxuan.php
@@ -4,6 +4,15 @@ $lang->xuanxuan = new stdclass();
 $lang->admin->menu->sso['link'] = 'Integrate|admin|xuanxuan';
 if(!isset($lang->admin->menu->sso['alias'])) $lang->admin->menu->sso['alias'] = '';
 $lang->admin->menu->sso['alias'] = $lang->admin->menu->sso['alias'] . ',sso';
+if(!isset($lang->admin->menu->sso['subModule'])) $lang->admin->menu->sso['subModule'] = '';
+$lang->admin->menu->sso['subModule'] = $lang->admin->menu->sso['subModule'] . ',client';
 
-$lang->admin->subMenu->sso->xuanxuan = 'ZT Client|admin|xuanxuan';
+$lang->admin->subMenu->sso->xuanxuan = array('link' => 'ZT Client|admin|xuanxuan', 'subModule' => 'client');
 $lang->admin->subMenuOrder->sso[4] = 'xuanxuan';
+
+$lang->client = new stdclass();
+$lang->client->menu = $lang->admin->menu;
+
+$lang->menugroup->client = 'admin';
+
+$lang->confirmDelete = 'Do you want to delete it?';
diff --git a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
index 6e9dbfe3df..a39a86fc8f 100644
--- a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
@@ -4,6 +4,12 @@ $lang->xuanxuan = new stdclass();
 $lang->admin->menu->sso['link'] = '集成|admin|xuanxuan';
 if(!isset($lang->admin->menu->sso['alias'])) $lang->admin->menu->sso['alias'] = '';
 $lang->admin->menu->sso['alias'] = $lang->admin->menu->sso['alias'] . ',sso';
+if(!isset($lang->admin->menu->sso['subModule'])) $lang->admin->menu->sso['subModule'] = '';
+$lang->admin->menu->sso['subModule'] = $lang->admin->menu->sso['subModule'] . ',client';
 
-$lang->admin->subMenu->sso->xuanxuan = '客户端集成|admin|xuanxuan';
+$lang->admin->subMenu->sso->xuanxuan = array('link' => '客户端集成|admin|xuanxuan', 'subModule' => 'client');
 $lang->admin->subMenuOrder->sso[4] = 'xuanxuan';
+
+$lang->menugroup->client = 'admin';
+
+$lang->confirmDelete = '您确定要执行删除操作吗？';
diff --git a/xuanxuan/module/common/view/footer.modal.html.php b/xuanxuan/module/common/view/footer.modal.html.php
new file mode 100644
index 0000000000..fa394d1d9e
--- /dev/null
+++ b/xuanxuan/module/common/view/footer.modal.html.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * The common modal footer view file of RanZhi.
+ *
+ * @copyright   Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Xiying Guan <guanxiying@xirangit.com>
+ * @package     RanZhi
+ * @version     $Id$
+ * @link        http://www.ranzhico.com
+ */
+?>
+<?php if(helper::isAjaxRequest()):?>
+    </div>
+  </div>
+</div>
+<?php if(isset($pageJS)) js::execute($pageJS);?>
+<script>
+$(function()
+{
+    var options = 
+    {
+        language: '<?php echo $this->app->getClientLang(); ?>',
+        weekStart: 1,
+        todayBtn:  1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'yyyy-mm-dd hh:ii'
+    }
+
+    $('.form-datetime').datetimepicker(options);
+    $('.form-date').datetimepicker($.extend(options, {minView: 2, format: 'yyyy-mm-dd'}));
+    $('.form-time').datetimepicker($.extend(options, {eleClass: 'only-pick-time', startView: 1, minView: 0, maxView: 1, format: 'hh:ii'}));
+    $('.form-month').datetimepicker($.extend(options, {startView: 3, minView: 3, format: 'yyyy-mm'}));
+    $('.chosen').chosen();
+});
+</script>
+<?php else:?>
+<?php include  $this->app->getAppRoot() . 'module/common/view/footer.html.php'; ?>
+<?php endif;?>
diff --git a/xuanxuan/module/common/view/header.modal.html.php b/xuanxuan/module/common/view/header.modal.html.php
new file mode 100644
index 0000000000..7b967eb51e
--- /dev/null
+++ b/xuanxuan/module/common/view/header.modal.html.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * The header.modal view of common module of RanZhi.
+ *
+ * @copyright   Copyright 2009-2016 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     common 
+ * @version     $Id$
+ * @link        http://www.ranzhico.com
+ */
+?>
+<?php if(helper::isAjaxRequest()):?>
+<?php
+$webRoot   = $config->webRoot;
+$jsRoot    = $webRoot . "js/";
+$themeRoot = $webRoot . "theme/";
+$modalSizeList = array('lg' => '900px', 'sm' => '300px');
+if(!isset($modalWidth)) $modalWidth = 700;
+if(is_numeric($modalWidth))
+{
+    $modalWidth .= 'px';
+}
+else if(isset($modalSizeList[$modalWidth]))
+{
+    $modalWidth = $modalSizeList[$modalWidth];
+}
+if(isset($pageCSS)) css::internal($pageCSS);
+?>
+<style>
+#ajaxForm .table tr:first-child td:nth-child(3){width:5px;}
+</style>
+<div class="modal-dialog" style="width:<?php echo $modalWidth;?>;">
+  <div class="modal-content">
+    <div class="modal-header">
+      <?php echo html::closeButton();?>
+      <strong class="modal-title"><?php if(!empty($title)) echo $title; ?></strong>
+      <?php if(!empty($subtitle)) echo "<label class='text-important'>" . $subtitle . '</label>'; ?>
+    </div>
+    <div class="modal-body">
+<?php else:?>
+<?php include $this->app->getAppRoot() . 'module/common/view/header.html.php';?>
+<?php endif;?>