Merge remote-tracking branch 'origin/master' into table-export-934

Conflicts:
	platform/commonUI/general/res/sass/controls/_buttons.scss
	platform/features/table/res/templates/mct-table.html

platform/features/table/src/controllers/MCTTableController.js

@@ -86,6 +86,12 @@ define(
              */
             $scope.$on('add:row', this.addRow.bind(this));
             $scope.$on('remove:row', this.removeRow.bind(this));
+
+            /*
+             * Listen for resize events to trigger recalculation of table width
+             */
+            $scope.resize = this.setElementSizes.bind(this);
+
         }
 
         /**