Merge remote-tracking branch 'remotes/cdeng/master' into k0stya-rowspan: Fixed an issue where the selected class is not applied to new visible columns (mleibman#1026)

Conflicts:
	controls/slick.columnpicker.js

Author: GerHobbelt

controls/slick.columnpicker.js

@@ -152,6 +152,11 @@
         });
 
         grid.setColumns(newColumnSet);
+        
+        if (grid.getSelectedRows().length > 0) {
+          grid.setSelectedRows(grid.getSelectedRows());
+        }
+
         var evd = new Slick.EventData();
         evd.hiddenColumns = invisibleColumns;
         evd.visibleColumns = visibleColumns;