merged wysihtml5 into master branch