Sprint 4 DEMO fix
Merge branch 'develop' of https://github.com/engagepoint/cmis-types-manager-b into develop