- Added Permit exception option
** Removed some deprecated scripts
** Fixed NPE in rest workspace list
Merge branch 'devel' into FTR-44_material-editor
[maven-release-plugin] prepare release parent-1.0.5
[maven-release-plugin] prepare for next development iteration
** Fixing paste screwup in mvn:prepare
[maven-release-plugin] prepare release 1.0.6
[maven-release-plugin] prepare for next development iteration
** Added /workspaces/{WORKSPACEENTITYID}/materials/{ID} end-point into
workspaces rest service
** Changed workspace-material-upload to fire discard event
Merge branch 'FTR-44_material-editor' of https://github.com/otavanopisto/muikku.git into FTR-44_material-editor
Merge branch 'FTR-44_material-editor' into devel
Merge branch 'devel' of https://github.com/otavanopisto/muikku into devel
Merge branch 'devel' into FTR-51-Communicator