clean up on Aisle 2.7
Merge branch 'Regis27' of https://github.com/chadberg/moodle into Regis27

Conflicts:
	grade/edit/tree/lib.php