** Added initial version of HtmlMaterial Field generation support
Merge branch 'FTR-4' of https://github.com/otavanopisto/muikku.git into
FTR-4

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/materialfields/HtmlMaterialFieldController.java