V2.5.5.4
Merge branch 'MOODLE_25' of github.com:gjb2048/moodle-courseformat_grid into MOODLE_25

Conflicts:
	Readme.md
	version.php