diff --git a/module/common/view/sortable.html.php b/module/common/view/sortable.html.php
index b71e44a02e..43ad4adc21 100644
--- a/module/common/view/sortable.html.php
+++ b/module/common/view/sortable.html.php
@@ -26,12 +26,6 @@ $(document).ready(function()
             trigger: $tbody.find('.sort-handler').length ? '.sort-handler' : null,
             finish: function(e)
             {
-                var orders = {};
-                e.list.each(function(){
-                    var $this = $(this);
-                    orders[$this.data('id')] = parseInt($this.attr('data-order'));
-                });
-                e.orders = orders;
                 $tbody.trigger('sort.sortable', e);
                 var $thead = $tbody.closest('table').children('thead');
                 $thead.find('.headerSortDown, .headerSortUp').removeClass('headerSortDown headerSortUp').addClass('header');
diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php
index fbb256d5af..1088f7b276 100644
--- a/module/product/view/index.html.php
+++ b/module/product/view/index.html.php
@@ -36,13 +36,9 @@
     <?php $vars = "locate=no&productID=$productID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
     <thead>
       <tr>
-<<<<<<< Updated upstream
         <?php if(strpos($orderBy, 'order') !== false):?>
         <th class='w-20px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, '<i></i>');?></th>
         <?php endif;?>
-=======
-        <th class='w-20px sort-default'><?php common::printOrderLink('custom', $orderBy, $vars, '<i></i>');?></th>
->>>>>>> Stashed changes
         <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
         <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?></th>
         <th class='w-80px'><?php echo $lang->story->statusList['active']  . $lang->story->common;?></th>
@@ -59,12 +55,8 @@
     <?php $canBatchEdit = common::hasPriv('product', 'batchEdit'); ?>
     <tbody class='sortable' id='productTableList'>
       <?php foreach($productStats as $product):?>
-<<<<<<< Updated upstream
       <tr class='text-center'>
         <?php if(strpos($orderBy, 'order') !== false):?>
-=======
-      <tr class='text-center' data-id='<?php echo $product->id ?>' data-order='<?php echo $product->id ?>'>
->>>>>>> Stashed changes
         <td class='sort-handler'><i class="icon icon-ellipsis-v"></i></td>
         <?php endif;?>
         <td>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index 39fd1faa41..1f0718e130 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -30,13 +30,9 @@
   <?php $vars = "locate=no&status=$status&projectID=$projectID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
   <thead>
     <tr>
-<<<<<<< Updated upstream
       <?php if(strpos($orderBy, 'order') !== false):?>
       <th class='w-20px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, '<i></i>');?></th>
       <?php endif;?>
-=======
-      <th class='w-20px sort-default'><?php common::printOrderLink('custom', $orderBy, $vars, '<i></i>');?></th>
->>>>>>> Stashed changes
       <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
       <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->project->name);?></th>
       <th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->project->code);?></th>
@@ -53,12 +49,8 @@
   <?php $canBatchEdit = common::hasPriv('project', 'batchEdit'); ?>
   <tbody class='sortable' id='projectTableList'>
   <?php foreach($projectStats as $project):?>
-<<<<<<< Updated upstream
   <tr class='text-center'>
     <?php if(strpos($orderBy, 'order') !== false):?>
-=======
-  <tr class='text-center' data-id='<?php echo $project->id ?>' data-order='<?php echo $project->id ?>'>
->>>>>>> Stashed changes
     <td class='sort-handler'><i class="icon icon-ellipsis-v"></i></td>
     <?php endif;?>
     <td>
diff --git a/www/js/zui/zui.sortable.js b/www/js/zui/zui.sortable.js
index 6e2e8a5b5f..30feea9e61 100644
--- a/www/js/zui/zui.sortable.js
+++ b/www/js/zui/zui.sortable.js
@@ -1,7 +1,7 @@
 /* ========================================================================
- * ZUI: sortable (include droppable)
+ * ZUI: sortable.js
  * http://zui.sexy
  * ========================================================================
  * Copyright (c) 2014 cnezsoft.com; Licensed MIT
  * ======================================================================== */
-!function(a,b,c){"use strict";var d=function(b,c){this.$=a(b),this.options=this.getOptions(c),this.init()};d.DEFAULTS={container:"body",deviation:5,sensorOffsetX:0,sensorOffsetY:0},d.prototype.getOptions=function(b){return b=a.extend({},d.DEFAULTS,this.$.data(),b)},d.prototype.callEvent=function(b,c){return a.zui.callEvent(this.options[b],c,this)},d.prototype.init=function(){this.handleMouseEvents()},d.prototype.handleMouseEvents=function(){var d=this.$,e=this,f=this.options,g="before";this.$triggerTarget=f.trigger?(a.isFunction(f.trigger)?f.trigger(d):d.find(f.trigger)).first():d,this.$triggerTarget.on("mousedown",function(h){function v(b){var h,i,q,v,w,x,g={left:b.pageX,top:b.pageY};c.abs(g.left-r.left)<f.deviation&&c.abs(g.top-r.top)<f.deviation||(null===l&&(h=m.css("position"),"absolute"!=h&&"relative"!=h&&"fixed"!=h&&(p=h,m.css("position","relative")),l=d.clone().removeClass("drag-from").addClass("drag-shadow").css({position:"absolute",width:d.outerWidth(),transition:"none"}).appendTo(m),d.addClass("dragging"),e.callEvent("start",{event:b,element:d})),i={left:g.left-t.left,top:g.top-t.top},q={left:i.left-s.left,top:i.top-s.top},l.css(q),u.left=g.left,u.top=g.top,v=!1,n=!1,f.flex||j.removeClass("drop-to"),w=null,j.each(function(){var b=a(this),c=b.offset(),d=b.outerWidth(),e=b.outerHeight(),h=c.left+f.sensorOffsetX,i=c.top+f.sensorOffsetY;return g.left>h&&g.top>i&&g.left<h+d&&g.top<i+e&&(w&&w.removeClass("drop-to"),w=b,!f.nested)?!1:void 0}),w&&(n=!0,x=w.data("id"),d.data("id")!=x&&(o=!1),(null===k||k.data("id")!==x&&!o)&&(v=!0),k=w,f.flex&&j.removeClass("drop-to"),k.addClass("drop-to")),f.flex?null!==k&&k.length&&(n=!0):(d.toggleClass("drop-in",n),l.toggleClass("drop-in",n)),e.callEvent("drag",{event:b,isIn:n,target:k,element:d,isNew:v,selfTarget:o,clickOffset:t,offset:i,position:{left:i.left-s.left,top:i.top-s.top},mouseOffset:g}),b.preventDefault())}function w(c){var f,g,h,i,q;return p&&m.css("position",p),null===l?(d.removeClass("drag-from"),a(b).unbind("mousemove",v).unbind("mouseup",w),e.callEvent("always",{event:c,cancel:!0}),void 0):(n||(k=null),f=!0,g={left:c.pageX,top:c.pageY},h={left:g.left-t.left,top:g.top-t.top},i={left:g.left-u.left,top:g.top-u.top},u.left=g.left,u.top=g.top,q={event:c,isIn:n,target:k,element:d,isNew:!o&&null!==k,selfTarget:o,offset:h,mouseOffset:g,position:{left:h.left-s.left,top:h.top-s.top},lastMouseOffset:u,moveOffset:i},f=e.callEvent("beforeDrop",q),f&&n&&e.callEvent("drop",q),a(b).unbind("mousemove",v).unbind("mouseup",w),j.removeClass("drop-to"),d.removeClass("dragging").removeClass("drag-from"),l.remove(),e.callEvent("finish",q),e.callEvent("always",q),c.preventDefault(),void 0)}var i,p,j,k,l,m,n,o,q,r,s,t,u;f.hasOwnProperty(g)&&a.isFunction(f[g])&&(i=f[g]({event:h,element:d}),void 0!==i&&!i)||(j=a.isFunction(f.target)?f.target(d):a(f.target),k=null,l=null,m=a(f.container).first(),n=!1,o=!0,q=d.offset(),r={left:h.pageX,top:h.pageY},s=m.offset(),t={left:r.left-q.left,top:r.top-q.top},u={left:r.left,top:r.top},d.addClass("drag-from"),a(b).bind("mousemove",v).bind("mouseup",w),h.preventDefault())})},d.prototype.reset=function(){this.$triggerTarget.off("mousedown"),this.handleMouseEvents()},a.fn.droppable=function(b){return this.each(function(){var c=a(this),e=c.data("zui.droppable"),f="object"==typeof b&&b;e||c.data("zui.droppable",e=new d(this,f)),"string"==typeof b&&e[b]()})},a.fn.droppable.Constructor=d}(jQuery,document,Math),+function(a){"use strict";var e=function(b,c){this.$=a(b),this.options=this.getOptions(c),this.init()};e.DEFAULTS={selector:"li, div",dragCssClass:"invisible"},e.prototype.getOptions=function(b){return b=a.extend({},e.DEFAULTS,this.$.data(),b)},e.prototype.init=function(){this.bindEventToList(this.$.children(this.options.selector))},e.prototype.reset=function(){var b=this,c=0,d=this.$.children(this.options.selector).not(".drag-shadow");d.each(function(){var f,e=a(this);e.data("zui.droppable")?(e.data("zui.droppable").options.target=d,e.droppable("reset")):b.bindEventToList(e),f=a(this).data("order"),"undefined"==typeof f&&a(this).attr("data-order",++c)})},e.prototype.bindEventToList=function(b){function e(b){var d,e,c=[];for(b.each(function(){var b=a(this).data("order");"number"==typeof b&&c.push(b)}),c.sort(function(a,b){return a-b}),d=b.length;c.length<d;)c.push(c.length?c[c.length-1]+1:0);e=0,b.each(function(){a(this).attr("data-order",c[e++])})}var c=this.$,d=this.options;e(b),b.droppable({trigger:d.trigger,target:c.children(d.selector),container:c,always:d.always,flex:!0,start:function(b){d.dragCssClass&&b.element.addClass(d.dragCssClass),a.zui.callEvent(d["start"])},drag:function(b){var f,g,h,i,j;if(c.addClass("sortable-sorting"),b.isIn){if(f=b.element,g=b.target,h=f.attr("data-order"),i=g.attr("data-order"),h==i)return;h>i?g.before(f):g.after(f),j=c.children(d.selector).not(".drag-shadow"),e(j),a.zui.callEvent(d["order"],{list:j,element:f})}},finish:function(b){d.dragCssClass&&b.element&&b.element.removeClass(d.dragCssClass),a.zui.callEvent(d["finish"],{list:c.children(d.selector),element:b.element}),c.removeClass("sortable-sorting")}})},a.fn.sortable=function(b){return this.each(function(){var c=a(this),d=c.data("zui.sortable"),f="object"==typeof b&&b;d?"object"==typeof b&&d.reset():c.data("zui.sortable",d=new e(this,f)),"string"==typeof b&&d[b]()})},a.fn.sortable.Constructor=e}(jQuery,window,document,Math);
+!function(a,b,c){"use strict";var d=function(b,c){this.$=a(b),this.options=this.getOptions(c),this.init()};d.DEFAULTS={container:"body",deviation:5,sensorOffsetX:0,sensorOffsetY:0},d.prototype.getOptions=function(b){return b=a.extend({},d.DEFAULTS,this.$.data(),b)},d.prototype.callEvent=function(b,c){return a.zui.callEvent(this.options[b],c,this)},d.prototype.init=function(){this.handleMouseEvents()},d.prototype.handleMouseEvents=function(){var d=this.$,e=this,f=this.options,g="before";this.$triggerTarget=f.trigger?(a.isFunction(f.trigger)?f.trigger(d):d.find(f.trigger)).first():d,this.$triggerTarget.on("mousedown",function(h){function v(b){var h,i,q,v,w,x,g={left:b.pageX,top:b.pageY};c.abs(g.left-r.left)<f.deviation&&c.abs(g.top-r.top)<f.deviation||(null===l&&(h=m.css("position"),"absolute"!=h&&"relative"!=h&&"fixed"!=h&&(p=h,m.css("position","relative")),l=d.clone().removeClass("drag-from").addClass("drag-shadow").css({position:"absolute",width:d.outerWidth(),transition:"none"}).appendTo(m),d.addClass("dragging"),e.callEvent("start",{event:b,element:d})),i={left:g.left-t.left,top:g.top-t.top},q={left:i.left-s.left,top:i.top-s.top},l.css(q),u.left=g.left,u.top=g.top,v=!1,n=!1,f.flex||j.removeClass("drop-to"),w=null,j.each(function(){var b=a(this),c=b.offset(),d=b.outerWidth(),e=b.outerHeight(),h=c.left+f.sensorOffsetX,i=c.top+f.sensorOffsetY;return g.left>h&&g.top>i&&g.left<h+d&&g.top<i+e&&(w&&w.removeClass("drop-to"),w=b,!f.nested)?!1:void 0}),w&&(n=!0,x=w.data("id"),d.data("id")!=x&&(o=!1),(null===k||k.data("id")!==x&&!o)&&(v=!0),k=w,f.flex&&j.removeClass("drop-to"),k.addClass("drop-to")),f.flex?null!==k&&k.length&&(n=!0):(d.toggleClass("drop-in",n),l.toggleClass("drop-in",n)),e.callEvent("drag",{event:b,isIn:n,target:k,element:d,isNew:v,selfTarget:o,clickOffset:t,offset:i,position:{left:i.left-s.left,top:i.top-s.top},mouseOffset:g}),b.preventDefault())}function w(c){var f,g,h,i,q;return p&&m.css("position",p),null===l?(d.removeClass("drag-from"),a(b).unbind("mousemove",v).unbind("mouseup",w),e.callEvent("always",{event:c,cancel:!0}),void 0):(n||(k=null),f=!0,g={left:c.pageX,top:c.pageY},h={left:g.left-t.left,top:g.top-t.top},i={left:g.left-u.left,top:g.top-u.top},u.left=g.left,u.top=g.top,q={event:c,isIn:n,target:k,element:d,isNew:!o&&null!==k,selfTarget:o,offset:h,mouseOffset:g,position:{left:h.left-s.left,top:h.top-s.top},lastMouseOffset:u,moveOffset:i},f=e.callEvent("beforeDrop",q),f&&n&&e.callEvent("drop",q),a(b).unbind("mousemove",v).unbind("mouseup",w),j.removeClass("drop-to"),d.removeClass("dragging").removeClass("drag-from"),l.remove(),e.callEvent("finish",q),e.callEvent("always",q),c.preventDefault(),void 0)}var i,p,j,k,l,m,n,o,q,r,s,t,u;f.hasOwnProperty(g)&&a.isFunction(f[g])&&(i=f[g]({event:h,element:d}),void 0!==i&&!i)||(j=a.isFunction(f.target)?f.target(d):a(f.target),k=null,l=null,m=a(f.container).first(),n=!1,o=!0,q=d.offset(),r={left:h.pageX,top:h.pageY},s=m.offset(),t={left:r.left-q.left,top:r.top-q.top},u={left:r.left,top:r.top},d.addClass("drag-from"),a(b).bind("mousemove",v).bind("mouseup",w),h.preventDefault())})},d.prototype.reset=function(){this.$triggerTarget.off("mousedown"),this.handleMouseEvents()},a.fn.droppable=function(b){return this.each(function(){var c=a(this),e=c.data("zui.droppable"),f="object"==typeof b&&b;e||c.data("zui.droppable",e=new d(this,f)),"string"==typeof b&&e[b]()})},a.fn.droppable.Constructor=d}(jQuery,document,Math),+function(a){"use strict";var e=function(b,c){this.$=a(b),this.options=this.getOptions(c),this.init()};e.DEFAULTS={selector:"li, div",dragCssClass:"invisible"},e.prototype.getOptions=function(b){return b=a.extend({},e.DEFAULTS,this.$.data(),b)},e.prototype.init=function(){this.bindEventToList(this.$.children(this.options.selector))},e.prototype.reset=function(){var b=this,c=0,d=this.$.children(this.options.selector);d.each(function(){var e=a(this);e.data("zui.droppable")?(e.data("zui.droppable").options.target=d,e.droppable("reset")):b.bindEventToList(e),a(this).attr("data-order",++c)})},e.prototype.bindEventToList=function(b){function e(b){var c=0;b.each(function(){a(this).attr("data-order",++c)})}var c=this.$,d=this.options;e(b),b.droppable({trigger:d.trigger,target:c.children(d.selector),container:c,always:d.always,flex:!0,start:function(b){d.dragCssClass&&b.element.addClass(d.dragCssClass),a.zui.callEvent(d["start"])},drag:function(b){var f,g,h,i,j;if(c.addClass("sortable-sorting"),b.isIn){if(f=b.element,g=b.target,h=f.attr("data-order"),i=g.attr("data-order"),h==i)return;h>i?g.before(f):g.after(f),j=c.children(d.selector),e(j),a.zui.callEvent(d["order"],{list:j,element:f})}},finish:function(b){d.dragCssClass&&b.element&&b.element.removeClass(d.dragCssClass),a.zui.callEvent(d["finish"],{list:c.children(d.selector),element:b.element}),c.removeClass("sortable-sorting")}})},a.fn.sortable=function(b){return this.each(function(){var c=a(this),d=c.data("zui.sortable"),f="object"==typeof b&&b;d?"object"==typeof b&&d.reset():c.data("zui.sortable",d=new e(this,f)),"string"==typeof b&&d[b]()})},a.fn.sortable.Constructor=e}(jQuery,window,document,Math);
diff --git a/www/upgrade.php b/www/upgrade.php
new file mode 100644
index 0000000000..4028dc3686
--- /dev/null
+++ b/www/upgrade.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * The upgrade router file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv11.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     ZenTaoPMS
+ * @version     $Id: upgrade.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $
+ * @link        http://www.zentao.net
+ */
+/* Judge my.php exists or not. */
+define('IN_UPGRADE', true);
+$myConfig = dirname(dirname(__FILE__)) . '/config/my.php';
+if(!file_exists($myConfig))
+{
+    echo "文件" . $myConfig . "不存在！ 提示：不要重命名原来的禅道安装目录，下载最新的源码包，覆盖即可。" . "<br />";
+    echo $myConfig . " doesn't exists! Please don't rename zentao before overriding the source code!";
+    exit;
+}
+
+error_reporting(0);
+
+/* Load the framework. */
+include '../framework/router.class.php';
+include '../framework/control.class.php';
+include '../framework/model.class.php';
+include '../framework/helper.class.php';
+
+/* Instance the app. */
+$app = router::createApp('pms', dirname(dirname(__FILE__)));
+$common = $app->loadCommon();
+
+/* Reset the config params to make sure the install program will be lauched. */
+$config->set('requestType', 'GET');
+$config->set('default.module', 'upgrade');
+$app->setDebug();
+
+/* Check the installed version is the latest or not. */
+$config->installedVersion = $common->loadModel('setting')->getVersion();
+if(version_compare($config->version, $config->installedVersion) <= 0) die(header('location: index.php'));
+
+/* Run it. */
+$app->parseRequest();
+$common->checkUpgradeStatus();
+$app->loadModule();