about and help templates
Merge branch 'master' into Rainer