Add wysiwyg_filter
Merge branch 'dev'