[markdown] Swapped from WYSIWYG to Markdown
Merge branch 'markdown' into dev
Merge branch 'dev'