ckeditor config.js
Merge branch 'new1' into master-angularfire