Upgrade CKEditor to 4.1.1
Update CHANGELOG
Merge branch '2.0'