CDB-1816 #resolve - color picker within codemirror editor ready :)
Merge branch 'master' into CDB-1816
codemirror lib updated from cartodb fork
Merge CDB-1816 into release/2.11.0