V2.5.4.4
Merge branch 'MOODLE_25' of github.com:gjb2048/moodle-courseformat_grid into MOODLE_25_CONTRIB_4099
Adaptive image code.
Change of 'image' to 'icon'.