html viewer
Merge branch 'htmlWidget' into develop