Upgrade to CKEditor 4.1.1

This release brings with it the Advanced Content Filter, ACF. For
details I highly advise you read the following URL to work out if there
will be any potential issues:

- http://ckeditor.com/blog/Upgrading-to-CKEditor-4.1
Merge branch 'gh/3.2/develop' into gh/master