Update CodeMirror
Update CodeMirror
Add cm border
Merge remote-tracking branch 'origin/master' into gh-pages