Merge dev-rawhtml

Add raw HTML viewing option