bug fixes
updating to froala 1.2.4
Resolved merge conflict