Merge branch 'master' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.documentation # Conflicts: # src/main/asciidoc/img/SIT_mapAppUsage.png # src/main/asciidoc/img/internet-liste.png # src/main/asciidoc/img/ort-adresse.png # src/main/asciidoc/img/ort-karte.png # src/main/asciidoc/img/verteilergruppe-anlegen-2.png # src/main/asciidoc/userDocumentation/userDocumentation.adoc