added codemirror dependency
Merge branch 'develop' into 7.x-1.x