rebase to master

prototype/src/main/resources/templates/intern/listedArticles/id.html

@@ -52,6 +52,7 @@
                             th:value="${ArticleID.priceNet}"/>&nbsp;EUR <br/>
                      (<span th:text="${ArticleID.vatPercent}"></span>% Mwst.)
                      <input type="hidden" id="vatPercent" name="vatPercent" th:value="${ArticleID.vatPercent}"/>
+
                      <!-- Info von article ref--> <br/>
                      = <span id="priceGross" th:text="${ArticleID.price}"></span>&nbsp;EUR Brutto
                   </p>