** Moved placeholders, enabled memofield plugin in [..]-editor-html.js
Merge branch 'FTR-44_material-editor' of https://github.com/otavanopisto/muikku into FTR-44_material-editor
** Text/memo field placeholders
** Working answers list on text fields
Merge branch 'FTR-44_material-editor' of
https://github.com/otavanopisto/muikku.git into FTR-44_material-editor

Conflicts:
	muikku/src/main/webapp/resources/scripts/gui/workspace-material-editor-html.js