Merge branch 'MDL-36804_assign_resubmission' of git://github.com/davosmith/moodle into HEAD

Conflicts:
	mod/assign/db/install.xml
	mod/assign/locallib.php
	mod/assign/mod_form.php