Merge branch 'WIP-MDL-35249-master' of git://github.com/nadavkav/moodle

Conflicts:
	mod/assign/gradingtable.php

diff --cc mod/assign/gradingtable.php
index e2a78fb,b3e01c9..53291dc
--- 1/mod/assign/gradingtable.php
--- 2/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@@ -158,12 -158,9 +158,8 @@@ class assign_grading_table extends tabl
          if (!$this->is_downloading()) {
              $columns[] = 'select';
              $headers[] = get_string('select') .
 -                        '<div class="selectall"><input type="checkbox" name="selectall" title="' .
 -                        get_string('selectall') .
 -                        '"/></div>';
 +                    '<div class="selectall"><label class="accesshide" for="selectall">' . get_string('selectall') . '</label>
 +                    <input type="checkbox" id="selectall" name="selectall" title="' . get_string('selectall') . '"/></div>';
- 
-             // We have to call this column userid so we can use userid as a default sortable column.
-             $columns[] = 'userid';
-             $headers[] = get_string('edit');
          }
  
          // User picture.