Merge pull request #5687 from relldoesphp/ckeditor_fix

CRM-16354 Upgrade CkEditor

diff --cc CRM/Admin/Form/Options.php
Simple merge

diff --cc CRM/Contact/Form/Relationship.php
Simple merge

diff --cc CRM/Contribute/Form/Task/Invoice.php
Simple merge

diff --cc CRM/Core/Form.php
Simple merge

diff --cc CRM/Event/Page/ManageEvent.php
Simple merge

diff --cc js/Common.js
Simple merge