Merge "SideBySide2: Map *.scala to clike CodeMirror mode"