diff --git a/Makefile b/Makefile
index 69a7ddbc02..81caf0d9d0 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ 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 '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
diff --git a/module/build/css/create.css b/module/build/css/create.css
index c07e19ef8c..4bbfe1b575 100644
--- a/module/build/css/create.css
+++ b/module/build/css/create.css
@@ -1 +1 @@
-#product_chosen .chosen-single{border-right:0px;}
+#branch_chosen .chosen-single{border-left:0px;}
diff --git a/module/common/model.php b/module/common/model.php
index 36e148258c..494db1cb28 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -382,10 +382,12 @@ class commonModel extends model
             $link['vars']   = $subMenuParams;
 
             $menu = new stdclass();
-            $menu->name   = $subMenuKey;
-            $menu->link   = $link;
-            $menu->text   = $subMenuName;
-            $menu->hidden = false;
+            $menu->name      = $subMenuKey;
+            $menu->link      = $link;
+            $menu->text      = $subMenuName;
+            $menu->subModule = isset($items->$subMenuKey['subModule']) ? $items->$subMenuKey['subModule'] : '';
+            $menu->alias     = isset($items->$subMenuKey['alias']) ? $items->$subMenuKey['alias'] : '';
+            $menu->hidden    = false;
             $subMenu[$subMenuKey] = $menu;
         }
 
diff --git a/module/cron/model.php b/module/cron/model.php
index 1296b676d5..021a99f1e4 100644
--- a/module/cron/model.php
+++ b/module/cron/model.php
@@ -62,7 +62,7 @@ class cronModel extends model
                     $parsedCron['schema']   = trim($matchs[0][0]);
                     $parsedCron['command']  = trim($matchs[0][1]);
                     $parsedCron['cron']     = CronExpression::factory($parsedCron['schema']);
-                    $parsedCron['time']     = $parsedCron['cron']->getNextRunDate();
+                    $parsedCron['time']     = $parsedCron['cron']->getNextRunDate($cron->lastTime);
                     $parsedCrons[$cron->id] = $parsedCron;
                 }   
                 catch(InvalidArgumentException $e) 
@@ -72,7 +72,6 @@ class cronModel extends model
                 }   
             }
         }
-        $this->dao->update(TABLE_CRON)->set('lastTime')->eq(date(DT_DATETIME1))->where('lastTime')->eq('0000-00-00 00:00:00')->andWhere('status')->ne('stop')->exec();
         return $parsedCrons;
     }
 
diff --git a/module/dept/model.php b/module/dept/model.php
index 2c87c52c11..5760df05b9 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -98,7 +98,7 @@ class deptModel extends model
             }
         }
 
-        $topMenu = @array_pop($deptMenu);
+        $topMenu = isset($deptMenu[0]) ? $deptMenu[0] : array_pop($deptMenu);
         $topMenu = explode("\n", trim($topMenu));
         $lastMenu[] = '/';
         foreach($topMenu as $menu)
diff --git a/module/project/model.php b/module/project/model.php
index 685d48642c..5fe8d36bd0 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -127,11 +127,11 @@ class projectModel extends model
                     foreach($subMenu as $menuKey => $menu)
                     {
                         $itemMenu = zget($projectSubMenu, $menuKey, '');
-                        if($moduleName == strtolower($menu->link['module']) and 
+                        if(($moduleName == strtolower($menu->link['module']) and 
                             (
                                 $methodName == strtolower($menu->link['method']) or
                                 (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false)
-                            )
+                            )) or (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false)
                         )
                         {
                             $this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);