** Added help and hint to DNM
** Material field decoding for text fields
Merge branch 'FTR-4' of
https://ilmoeuro@github.com/otavanopisto/muikku.git into FTR-4

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/materialfields/HtmlMaterialFieldController.java
	muikku-core-plugins/src/main/java/fi/muikku/plugins/materialfields/MaterialHtmlFieldPluginDescriptor.java
Merge branch 'FTR-4' of
https://ilmoeuro@github.com/otavanopisto/muikku.git into FTR-4

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