html preview and critical issue with document names
Merge branch 'ivan' into dev
Merge branch 'dev' into mark