** Copied CoOps from coops-demo
Merge branch 'devel' into FTR-44_material-editor
** Updated DAOs to reflect new plugin system
** Added target to .gitignore
Merge branch 'devel' into FTR-44_material-editor
** s/Material/MaterialId
Merge branch 'devel' of https://ilmoeuro@github.com/otavanopisto/muikku.git into devel
Merge branch 'devel' into FTR-44_material-editor
Merge branch 'devel' of https://ilmoeuro@github.com/otavanopisto/muikku.git into devel
Merge branch 'devel' of https://ilmoeuro@github.com/otavanopisto/muikku.git into devel
Merge branch 'devel' into FTR-44_material-editor
** Refactoring workspaceMaterial.material -> workspaceMaterial ->
materialId
Merge branch 'FTR-50-WORKSPACE-VIEWS' into FTR-44_material-editor
** Fixed non-compiling code block in WorkspaceMaterialsBackingBean
Merge branch 'FTR-50-WORKSPACE-VIEWS' into FTR-44_material-editor

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/workspace/WorkspaceMaterialsBackingBean.java
Merge branch 'FTR-44_material-editor' into FTR-50-WORKSPACE-VIEWS
* Fixed go back navigation in material's reading view
Merge branch 'FTR-50-WORKSPACE-VIEWS' of https://github.com/otavanopisto/muikku into FTR-50-WORKSPACE-VIEWS