Merge pull request #4 from dkorff/DEMATIC_2.5

Dematic 2.5 from moodle25stable
Revert "Dematic 2.5 from moodle25stable"
Merge pull request #5 from dkorff/revert-4-DEMATIC_2.5

Revert "Dematic 2.5 from moodle25stable"
Merge pull request #6 from dkorff/MOODLE_25_STABLE

commits from moodle 25 to dematic_25