Merge branch 'release/0.4.1' into develop
added wysiwyg row
bumped version
Merge branch 'release/0.4.2'