Merge branch 'master' into HTMLexport
fix for new category management
some cosmetics in HTML output
update of translation files
Merge branch 'HTMLexport'