CodeMirror editor added
Merge commit
Admin console updates