Applying stash
User report changes
Merge branch '28_natural_weights_user_report' into 28_natural_weights_user_report-2

Conflicts:
	grade/lib.php
	grade/report/user/index.php
	grade/report/user/lib.php