Convert wikitext to html, depending on editor needs

Change-Id: Iab7bae8aa93c95f7c36d86533f469e709fc0533b
Merge "Convert wikitext to html, depending on editor needs"