Merge pull request #1137 from stevewithington/develop

CKEditor updates: codemirror, add sourcedialog if admin/superuser