Updated editor config to MCE 4 API
Merge branch 'master' into blue