Merge branch 'master' into 'sprint/206_liumengyi_58288'

# Conflicts:
#   db/update17.1.sql

module/execution/view/create.html.php

@@ -217,7 +217,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->execution->team;?></th>
-          <td colspan='3'><?php echo html::select('teamMembers[]', $users, '', "class='form-control chosen' multiple"); ?></td>
+          <td colspan='3'><?php echo html::select('teamMembers[]', $users, '', "class='form-control picker-select' multiple"); ?></td>
         </tr>
         <tr>
           <th><?php echo $lang->kanban->columnWidth;?></th>
@@ -246,7 +246,7 @@
           <th><?php echo $lang->whitelist;?></th>
           <td colspan='2'>
             <div class='input-group'>
-              <?php echo html::select('whitelist[]', $users, $whitelist, 'class="form-control chosen" multiple');?>
+              <?php echo html::select('whitelist[]', $users, $whitelist, 'class="form-control picker-select" multiple');?>
               <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
             </div>
           </td>