#1116 Disabled inline editing in ckEditor
Merge branch 'dev' into dev-master-widgets