Update HtmlSaniter so that it does not convert &nbsp; to &amp;nbsp;
Merge branch 'origin/develop'