Merge branch 'master' into Updates
update core
update ckeditor
install ckeditor lib
Merge branch 'Updates'