diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 88edc76106..af961d2ca2 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -133,11 +133,12 @@ $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
 $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
 $lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
+$lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',admin,';
+$lang->dividerMenu = ',admin,project,repo,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly         = 'project';
 $lang->navGroup->milestone      = 'project';
 $lang->navGroup->pssp           = 'project';
 $lang->navGroup->design         = 'project';
-$lang->navGroup->repo           = 'project';
 $lang->navGroup->issue          = 'project';
 $lang->navGroup->risk           = 'project';
 $lang->navGroup->auditplan      = 'project';
 $lang->navGroup->cm             = 'project';
 $lang->navGroup->nc             = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
 $lang->navGroup->build          = 'project';
 $lang->navGroup->projectrelease = 'project';
 $lang->navGroup->projectbuild   = 'project';
 
 $lang->navGroup->durationestimation = 'project';
 
+$lang->navGroup->repo    = 'repo';
+$lang->navGroup->job     = 'repo';
+$lang->navGroup->jenkins = 'repo';
+$lang->navGroup->compile = 'repo';
+
 $lang->navGroup->stage         = 'system';
 $lang->navGroup->measurement   = 'system';
 $lang->navGroup->report        = 'system';
@@ -958,6 +960,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index a7d3af338b..e42cf1b824 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -133,11 +133,12 @@ $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
 $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
 $lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
+$lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',admin,';
+$lang->dividerMenu = ',admin,project,repo,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly         = 'project';
 $lang->navGroup->milestone      = 'project';
 $lang->navGroup->pssp           = 'project';
 $lang->navGroup->design         = 'project';
-$lang->navGroup->repo           = 'project';
 $lang->navGroup->issue          = 'project';
 $lang->navGroup->risk           = 'project';
 $lang->navGroup->auditplan      = 'project';
 $lang->navGroup->cm             = 'project';
 $lang->navGroup->nc             = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
 $lang->navGroup->build          = 'project';
 $lang->navGroup->projectrelease = 'project';
 $lang->navGroup->projectbuild   = 'project';
 
 $lang->navGroup->durationestimation = 'project';
 
+$lang->navGroup->repo    = 'repo';
+$lang->navGroup->job     = 'repo';
+$lang->navGroup->jenkins = 'repo';
+$lang->navGroup->compile = 'repo';
+
 $lang->navGroup->stage         = 'system';
 $lang->navGroup->measurement   = 'system';
 $lang->navGroup->report        = 'system';
@@ -958,6 +960,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index dc13e3aaf1..230c806ba6 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -133,11 +133,12 @@ $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
 $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
 $lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
+$lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',admin,';
+$lang->dividerMenu = ',admin,project,repo,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly         = 'project';
 $lang->navGroup->milestone      = 'project';
 $lang->navGroup->pssp           = 'project';
 $lang->navGroup->design         = 'project';
-$lang->navGroup->repo           = 'project';
 $lang->navGroup->issue          = 'project';
 $lang->navGroup->risk           = 'project';
 $lang->navGroup->auditplan      = 'project';
 $lang->navGroup->cm             = 'project';
 $lang->navGroup->nc             = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
 $lang->navGroup->build          = 'project';
 $lang->navGroup->projectrelease = 'project';
 $lang->navGroup->projectbuild   = 'project';
 
 $lang->navGroup->durationestimation = 'project';
 
+$lang->navGroup->repo    = 'repo';
+$lang->navGroup->job     = 'repo';
+$lang->navGroup->jenkins = 'repo';
+$lang->navGroup->compile = 'repo';
+
 $lang->navGroup->stage         = 'system';
 $lang->navGroup->measurement   = 'system';
 $lang->navGroup->report        = 'system';
@@ -958,6 +960,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 5b8051343f..8e088c00a6 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -133,11 +133,12 @@ $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
 $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
 $lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
+$lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',admin,';
+$lang->dividerMenu = ',admin,project,repo,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly         = 'project';
 $lang->navGroup->milestone      = 'project';
 $lang->navGroup->pssp           = 'project';
 $lang->navGroup->design         = 'project';
-$lang->navGroup->repo           = 'project';
 $lang->navGroup->issue          = 'project';
 $lang->navGroup->risk           = 'project';
 $lang->navGroup->auditplan      = 'project';
 $lang->navGroup->cm             = 'project';
 $lang->navGroup->nc             = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
 $lang->navGroup->build          = 'project';
 $lang->navGroup->projectrelease = 'project';
 $lang->navGroup->projectbuild   = 'project';
 
 $lang->navGroup->durationestimation = 'project';
 
+$lang->navGroup->repo    = 'repo';
+$lang->navGroup->job     = 'repo';
+$lang->navGroup->jenkins = 'repo';
+$lang->navGroup->compile = 'repo';
+
 $lang->navGroup->stage         = 'system';
 $lang->navGroup->measurement   = 'system';
 $lang->navGroup->report        = 'system';
@@ -958,6 +960,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 6440230db0..5fec127a62 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -133,11 +133,12 @@ $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> 地盘|my|index|';
 $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> 项目集|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-product"></i> 产品|product|index|';
 $lang->mainNav->project = '<i class="icon icon-project"></i> 项目|program|prjbrowse|';
+$lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代码|repo|browse|';
 $lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|subject|browse|';
 $lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 后台|admin|index|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',admin,';
+$lang->dividerMenu = ',admin,project,repo,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly         = 'project';
 $lang->navGroup->milestone      = 'project';
 $lang->navGroup->pssp           = 'project';
 $lang->navGroup->design         = 'project';
-$lang->navGroup->repo           = 'project';
 $lang->navGroup->issue          = 'project';
 $lang->navGroup->risk           = 'project';
 $lang->navGroup->auditplan      = 'project';
 $lang->navGroup->cm             = 'project';
 $lang->navGroup->nc             = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
 $lang->navGroup->build          = 'project';
 $lang->navGroup->projectrelease = 'project';
 $lang->navGroup->projectbuild   = 'project';
 
 $lang->navGroup->durationestimation = 'project';
 
+$lang->navGroup->repo    = 'repo';
+$lang->navGroup->job     = 'repo';
+$lang->navGroup->jenkins = 'repo';
+$lang->navGroup->compile = 'repo';
+
 $lang->navGroup->stage         = 'system';
 $lang->navGroup->measurement   = 'system';
 $lang->navGroup->report        = 'system';
@@ -891,7 +893,6 @@ $lang->menu->waterfall->weekly         = array('link' => '报告|weekly|index|pr
 $lang->menu->waterfall->doc            = array('link' => '文档|doc|index|project={PROJECT}');
 $lang->menu->waterfall->projectstory   = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track');
 $lang->menu->waterfall->design         = '设计|design|browse|product={PRODUCT}';
-$lang->menu->waterfall->ci             = '代码|repo|browse|';
 $lang->menu->waterfall->qa             = array('link' => '测试|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,');
 $lang->menu->waterfall->projectrelease = array('link' => '发布|projectrelease|browse');
 $lang->menu->waterfall->issue          = '问题|issue|browse|';
@@ -958,6 +959,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => '跟踪矩阵|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/model.php b/module/common/model.php
index 8fc7374b40..ba21acd61e 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -558,8 +558,8 @@ class commonModel extends model
     public static function getRecentExecutions()
     {
         global $dbh, $lang, $app;
-        echo '<li><hr></li>';
-        echo '<li><span id="mainRecent"><i class="icon icon-menu-doc"></i> ' . $lang->recent . '</span></li>';
+        echo "<li class='divider'></li>";
+        echo '<li><span id="mainRecent"><i class="icon icon-recent"></i> ' . $lang->recent . '</span></li>';
 
         $extraWhere = empty($app->user->admin) ? ' and id in (' . $app->user->view->sprints . ') and project in (' . $app->user->view->projects . ') ' : '';
 
@@ -778,6 +778,7 @@ class commonModel extends model
         /* Set main menu by group. */
         $group = isset($lang->navGroup->$moduleName) ? $lang->navGroup->$moduleName : '';
         if($moduleName == 'admin') return;
+        if($group == 'repo') return;
         if($group == 'my') self::getMyModuleMenu($moduleName, $methodName);
         if($group == 'project') self::getProgramModuleMenu($moduleName);
 
@@ -2304,6 +2305,11 @@ EOD;
             $lang->menu      = $lang->product->menu;
             $lang->menuOrder = $lang->product->menuOrder;
         }
+        if($group == 'repo')
+        {
+            $lang->menu      = $lang->repo->menu;
+            $lang->menuOrder = $lang->repo->menuOrder;
+        }
         if($group == 'project')
         {
             $lang->menu = self::getProgramMainMenu($moduleName);
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index 4e78ad3644..6765f9404a 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -195,6 +195,8 @@ $lang->program->PGMExport            = 'Export';
 $lang->program->PGMStakeholder       = 'Stakeholder';
 $lang->program->createStakeholder    = 'Create Stakeholder';
 $lang->program->unlinkStakeholder    = 'Unlink Stakeholder';
+$lang->program->stakeholderType      = 'Stakeholder type';
+$lang->program->isStakeholderKey     = 'Key stakeholder';
 $lang->program->importStakeholder    = 'Import program';
 $lang->program->PGMManageMembers     = 'Program Team';
 $lang->program->PGMParentBudget      = "Parent program budget：%s";
@@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent  = "Parent end date: %s, end date should be
 $lang->program->PGMBeginGreateChild  = "Child earliest begin: %s, parent begin date <= child earliest begin date.";
 $lang->program->PGMEndLetterChild    = "Child latest end: %s, parent end date >= child latest end date.";
 
+$lang->program->stakeholderTypeList['inside']  = 'Inside';
+$lang->program->stakeholderTypeList['outside'] = 'Outside';
+
 /* Fields. */
 $lang->program->PGMName      = 'Name';
 $lang->program->PGMTemplate  = 'Template';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index cc6d87f65f..91e02f76fd 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -195,6 +195,8 @@ $lang->program->PGMExport            = 'Export';
 $lang->program->PGMStakeholder       = 'Stakeholder';
 $lang->program->createStakeholder    = 'Create Stakeholder';
 $lang->program->unlinkStakeholder    = 'Unlink Stakeholder';
+$lang->program->stakeholderType      = 'Stakeholder type';
+$lang->program->isStakeholderKey     = 'Key stakeholder';
 $lang->program->importStakeholder    = 'Import program';
 $lang->program->PGMManageMembers     = 'Program Team';
 $lang->program->PGMParentBudget      = "Parent program budget：%s";
@@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent  = "Parent end date: %s, end date should be
 $lang->program->PGMBeginGreateChild  = "Child earliest begin: %s, parent begin date <= child earliest begin date.";
 $lang->program->PGMEndLetterChild    = "Child latest end: %s, parent end date >= child latest end date.";
 
+$lang->program->stakeholderTypeList['inside']  = 'Inside';
+$lang->program->stakeholderTypeList['outside'] = 'Outside';
+
 /* Fields. */
 $lang->program->PGMName      = 'Name';
 $lang->program->PGMTemplate  = 'Template';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index 4e78ad3644..6765f9404a 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -195,6 +195,8 @@ $lang->program->PGMExport            = 'Export';
 $lang->program->PGMStakeholder       = 'Stakeholder';
 $lang->program->createStakeholder    = 'Create Stakeholder';
 $lang->program->unlinkStakeholder    = 'Unlink Stakeholder';
+$lang->program->stakeholderType      = 'Stakeholder type';
+$lang->program->isStakeholderKey     = 'Key stakeholder';
 $lang->program->importStakeholder    = 'Import program';
 $lang->program->PGMManageMembers     = 'Program Team';
 $lang->program->PGMParentBudget      = "Parent program budget：%s";
@@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent  = "Parent end date: %s, end date should be
 $lang->program->PGMBeginGreateChild  = "Child earliest begin: %s, parent begin date <= child earliest begin date.";
 $lang->program->PGMEndLetterChild    = "Child latest end: %s, parent end date >= child latest end date.";
 
+$lang->program->stakeholderTypeList['inside']  = 'Inside';
+$lang->program->stakeholderTypeList['outside'] = 'Outside';
+
 /* Fields. */
 $lang->program->PGMName      = 'Name';
 $lang->program->PGMTemplate  = 'Template';
diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php
index 4e78ad3644..6765f9404a 100644
--- a/module/program/lang/vi.php
+++ b/module/program/lang/vi.php
@@ -195,6 +195,8 @@ $lang->program->PGMExport            = 'Export';
 $lang->program->PGMStakeholder       = 'Stakeholder';
 $lang->program->createStakeholder    = 'Create Stakeholder';
 $lang->program->unlinkStakeholder    = 'Unlink Stakeholder';
+$lang->program->stakeholderType      = 'Stakeholder type';
+$lang->program->isStakeholderKey     = 'Key stakeholder';
 $lang->program->importStakeholder    = 'Import program';
 $lang->program->PGMManageMembers     = 'Program Team';
 $lang->program->PGMParentBudget      = "Parent program budget：%s";
@@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent  = "Parent end date: %s, end date should be
 $lang->program->PGMBeginGreateChild  = "Child earliest begin: %s, parent begin date <= child earliest begin date.";
 $lang->program->PGMEndLetterChild    = "Child latest end: %s, parent end date >= child latest end date.";
 
+$lang->program->stakeholderTypeList['inside']  = 'Inside';
+$lang->program->stakeholderTypeList['outside'] = 'Outside';
+
 /* Fields. */
 $lang->program->PGMName      = 'Name';
 $lang->program->PGMTemplate  = 'Template';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 87baa0485a..5a738881db 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -195,6 +195,8 @@ $lang->program->PGMExport            = '导出';
 $lang->program->PGMStakeholder       = '干系人列表';
 $lang->program->createStakeholder    = '添加干系人';
 $lang->program->unlinkStakeholder    = '移除干系人';
+$lang->program->stakeholderType      = '干系人类型';
+$lang->program->isStakeholderKey     = '关键干系人';
 $lang->program->importStakeholder    = '从父项目集导入';
 $lang->program->PGMManageMembers     = '项目集团队';
 $lang->program->PGMParentBudget      = "父项目集预算：%s";
@@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent  = "父项目集的完成日期：%s，完
 $lang->program->PGMBeginGreateChild  = "子项目集的最小开始日期：%s，父项目集的开始日期不能大于子项目集的最小开始日期";
 $lang->program->PGMEndLetterChild    = "子项目的最大完成日期：%s，父项目的完成日期不能小于子项目的最大完成日期";
 
+$lang->program->stakeholderTypeList['inside']  = '内部';
+$lang->program->stakeholderTypeList['outside'] = '外部';
+
 /* Fields. */
 $lang->program->PGMName      = '项目集名称';
 $lang->program->PGMTemplate  = '项目集模板';
diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php
index aaa55ad41c..803e351658 100644
--- a/module/program/lang/zh-tw.php
+++ b/module/program/lang/zh-tw.php
@@ -198,6 +198,8 @@ $lang->program->PGMExport            = '導出';
 $lang->program->PGMStakeholder       = '干係人列表';
 $lang->program->createStakeholder    = '添加干係人';
 $lang->program->unlinkStakeholder    = '移除干係人';
+$lang->program->stakeholderType      = '干係人類型';
+$lang->program->isStakeholderKey     = '關鍵干係人';
 $lang->program->importStakeholder    = '從父項目集導入';
 $lang->program->PGMManageMembers     = '項目集團隊';
 $lang->program->PGMParentBudget      = "父項目集預算：%s";
@@ -207,6 +209,9 @@ $lang->program->PGMEndGreaterParent  = "父項目集的完成日期：%s，完
 $lang->program->PGMBeginGreateChild  = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
 $lang->program->PGMEndLetterChild    = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
 
+$lang->program->stakeholderTypeList['inside']  = '内部';
+$lang->program->stakeholderTypeList['outside'] = '外部';
+
 /* Fields. */
 $lang->program->PGMName      = '項目集名稱';
 $lang->program->PGMTemplate  = '項目集模板';
diff --git a/module/program/model.php b/module/program/model.php
index 1ea547b914..b2af8e63f0 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -449,7 +449,7 @@ class programModel extends model
      */
     public function getStakeholders($programID = 0, $orderBy, $pager = null)
     {
-        return $this->dao->select('t2.account,t2.realname,t2.role,t2.qq,t2.mobile,t2.phone,t2.weixin,t2.email,t1.id')->from(TABLE_STAKEHOLDER)->alias('t1')
+        return $this->dao->select('t2.account,t2.realname,t2.role,t2.qq,t2.mobile,t2.phone,t2.weixin,t2.email,t1.id,t1.type,t1.key')->from(TABLE_STAKEHOLDER)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
             ->where('t1.objectID')->eq($programID)
             ->andWhere('t1.objectType')->eq('program')
diff --git a/module/program/view/pgmstakeholder.html.php b/module/program/view/pgmstakeholder.html.php
index 85c7f16b92..b909f186f6 100644
--- a/module/program/view/pgmstakeholder.html.php
+++ b/module/program/view/pgmstakeholder.html.php
@@ -32,6 +32,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th><?php echo $lang->user->realname;?></th>
+          <th class="w-100px"><?php echo $lang->program->stakeholderType;?></th>
           <th class="w-120px"><?php echo $lang->user->role;?></th>
           <th class="w-120px"><?php echo $lang->user->phone;?></th>
           <th class="w-120px"><?php echo $lang->user->qq;?></th>
@@ -46,7 +47,10 @@
           <td class='c-id'>
             <?php printf('%03d', $stakeholder->id);?>
           </td>
-          <td><?php echo $stakeholder->realname;?></td>
+          <?php $isKey = $stakeholder->key ? " <i class='icon icon-star-empty'></i>" : '';?>
+          <?php $title = $stakeholder->key ? $lang->program->isStakeholderKey : '';?>
+          <td title="<?php echo $title;?>"><?php echo $stakeholder->realname . $isKey;?></td>
+          <td title='<?php echo zget($lang->program->stakeholderTypeList, $stakeholder->type, '');?>'><?php echo zget($lang->program->stakeholderTypeList, $stakeholder->type, '');?></td>
           <td><?php echo zget($lang->user->roleList, $stakeholder->role);?></td>
           <td title="<?php echo $stakeholder->phone;?>"><?php echo $stakeholder->phone;?></td>
           <td title="<?php echo $stakeholder->qq;?>"><?php echo $stakeholder->qq;?></td>
diff --git a/module/repo/control.php b/module/repo/control.php
index 8d88c847bd..5f5843b845 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -60,9 +60,10 @@ class repo extends control
         $this->view->position[] = $this->lang->repo->common;
         $this->view->position[] = $this->lang->repo->browse;
 
-        $this->view->repoID    = $repoID;
+        $this->view->repoID     = $repoID;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
+        $this->view->products   = $this->loadModel('product')->getPairs('noclosed');
 
         $this->display();
     }
diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php
index ea3aecd413..5a7cb805fb 100644
--- a/module/repo/lang/de.php
+++ b/module/repo/lang/de.php
@@ -28,7 +28,6 @@ $lang->repo->submit     = 'Submit';
 $lang->repo->cancel     = 'Cancel';
 $lang->repo->addComment = 'Add Comment';
 
-$lang->repo->product  = $lang->productCommon;
 $lang->repo->module   = 'Module';
 $lang->repo->type     = 'Type';
 $lang->repo->assign   = 'AssignTo';
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index 8fbdc5ec7f..35a166084d 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -28,7 +28,6 @@ $lang->repo->submit     = 'Submit';
 $lang->repo->cancel     = 'Cancel';
 $lang->repo->addComment = 'Add Comment';
 
-$lang->repo->product  = $lang->productCommon;
 $lang->repo->module   = 'Module';
 $lang->repo->type     = 'Type';
 $lang->repo->assign   = 'AssignTo';
diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php
index e31e2b4887..3f011c9ee1 100644
--- a/module/repo/lang/fr.php
+++ b/module/repo/lang/fr.php
@@ -28,7 +28,6 @@ $lang->repo->submit     = 'Soumettre';
 $lang->repo->cancel     = 'Annuler';
 $lang->repo->addComment = 'Ajout Comment';
 
-$lang->repo->product  = $lang->productCommon;
 $lang->repo->module   = 'Module';
 $lang->repo->type     = 'Type';
 $lang->repo->assign   = 'Assigner à';
diff --git a/module/repo/lang/vi.php b/module/repo/lang/vi.php
index 36eb8590db..c10b46b417 100644
--- a/module/repo/lang/vi.php
+++ b/module/repo/lang/vi.php
@@ -28,7 +28,6 @@ $lang->repo->submit     = 'Gửi';
 $lang->repo->cancel     = 'Hủy';
 $lang->repo->addComment = 'Thêm nhận xét';
 
-$lang->repo->product  = $lang->productCommon;
 $lang->repo->module   = 'Module';
 $lang->repo->type     = 'Loại';
 $lang->repo->assign   = 'Giao cho';
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index b51082dd36..456ef979d0 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -28,7 +28,6 @@ $lang->repo->submit     = '提交';
 $lang->repo->cancel     = '取消';
 $lang->repo->addComment = '添加评论';
 
-$lang->repo->product  = $lang->productCommon;
 $lang->repo->module   = '模块';
 $lang->repo->type     = '类型';
 $lang->repo->assign   = '指派';
diff --git a/module/repo/view/maintain.html.php b/module/repo/view/maintain.html.php
index 72eb1447fc..3e3145105a 100644
--- a/module/repo/view/maintain.html.php
+++ b/module/repo/view/maintain.html.php
@@ -20,6 +20,7 @@
           <th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->repo->id); ?></th>
           <th class='w-120px'><?php common::printOrderLink('SCM', $orderBy, $vars, $lang->repo->type); ?></th>
           <th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->repo->name); ?></th>
+          <th class='w-200px text-left'><?php common::printOrderLink('product', $orderBy, $vars, $lang->repo->product); ?></th>
           <th class='text-left'><?php echo $lang->repo->path; ?></th>
           <th class='w-100px c-actions-4'><?php echo $lang->actions; ?></th>
         </tr>
@@ -30,6 +31,15 @@
           <td class='text-center'><?php echo $id; ?></td>
           <td class='text'><?php echo zget($lang->repo->scmList, $repo->SCM); ?></td>
           <td class='text' title='<?php echo $repo->name; ?>'><?php echo html::a($this->createLink('repo', 'browse', "repoID={$repo->id}"), $repo->name);?></td>
+          <td class='text'>
+          <?php 
+		  $productList = explode(',', str_replace(' ', '', $repo->product));
+          if($productList[0])
+          {   
+              foreach($productList as $productID) echo ' ' . html::a($this->createLink('product', 'browse', "productID=$productID"), zget($products, $productID, $productID));
+          }   
+          ?>
+          </td>
           <td class='text' title='<?php echo $repo->path; ?>'><?php echo $repo->path; ?></td>
           <td class='text-left c-actions'>
             <?php