Upgrade from ckeditor3 to ckeditor4
updated HtmlEditor for ckeditor4 stuff.  HtmlContentDetail now correctly changes approval status to not-approved when content is edited
Merge branch 'feature_mp_ckeditor4'