Fix edit forms and comment events in lib.
Merge branch 'master' of https://github.com/moodlemoot/taxonomy

Conflicts:
	forms/VocabularyEditPage.php
Merge branch 'master' of https://github.com/moodlemoot/taxonomy

Conflicts:
	forms/VocabularyEditPage.php