** Fixed omissions left from refactoring
Merge branch 'FTR-44_material-editor' of https://ilmoeuro@github.com/otavanopisto/muikku.git into FTR-44_material-editor