local updates
local plugin updates
partial pull
pp2
Merge branch 'Regis27' of https://github.com/chadberg/moodle into Regis27

Conflicts:
	course/format/grid/Readme.md
	course/format/grid/version.php
	mod/hotpot/lib.php
	mod/hotpot/version.php
	mod/hotpot/view.php