Merge branch 'MDL-32932' of git://github.com/netspotau/moodle-mod_assign

Conflicts:
	mod/assign/gradingtable.php

diff --cc mod/assign/lang/en/assign.php
Simple merge

diff --cc mod/assign/locallib.php
Simple merge

diff --cc mod/assign/renderer.php
Simple merge

diff --cc mod/assign/styles.css
Simple merge