Made dialog in cp-editor always beeing viewable
Merge branch 'api-1.2' into cp-1.1