Merge branch 'master' into HTMLexport
update in HTML output
some more HTML cosmetics
Merge branch 'HTMLexport'