Merge branch 'release/0.2.6' into develop
added wysiwyg support
bumped version
Merge branch 'release/0.2.7'