- conflict resolution
Merge branch 'FTR-44_material-editor' of
https://github.com/otavanopisto/muikku.git into FTR-44_material-editor

Conflicts:
	muikku-core-plugins/src/main/resources/META-INF/resources/workspaces/materials-reading.xhtml
Merge branch 'FTR-44_material-editor' of https://github.com/otavanopisto/muikku.git into FTR-44_material-editor
- dynamic page loading to materials main and reading views