fixed problem related to ckeditor bugs out.
Merge branch 'master' of https://github.com/getshop/FrontEnd