Convert to wysihtml5
Merge branch 'master' into wysihtml5