wysiwyg is added
Merge branch 'features/boostrap_wysiwyg' into develop