Merge branch 'master' into 'sprint/183_zhengrunyu_48003'

# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
#   module/kanban/model.php

db/update16.2.sql

@@ -3,6 +3,7 @@ UPDATE `zt_kanbanspace` SET `type` = 'cooperation';
 
 ALTER TABLE `zt_kanban` ADD `importObject` varchar(255) NOT NULL AFTER `displayCards`;
 ALTER TABLE `zt_kanban` ADD `performable` enum ('0', '1') NOT NULL DEFAULT '0' AFTER `archived`;
+ALTER TABLE `zt_kanbancard` ADD `status` varchar(30) NOT NULL AFTER `name`;
 
 ALTER TABLE `zt_kanbancard` ADD `fromID` int(8) NOT NULL  AFTER `group`;
 ALTER TABLE `zt_kanbancard` ADD `fromType` varchar(50) NOT NULL AFTER `fromID`;