Upgraded to CKEditor 4.0.1
Merge branch 'gh/3.2/develop' into gh/master