Merge branch 'v4' of https://github.com/wracce/websoft-docs-page into v4

Merge branch 'v4' of https://github.com/wracce/websoft-docs-page into v4 #14