Merge branch 'master' of https://git.fslab.de/tpinza2s/s4s

src/main/java/org/s4s/dao/ProductDAO.java

src/main/java/org/s4s/dao/impl/ProductDAOimpl.java

src/main/java/org/s4s/dao/impl/ShopDAOimpl.java

src/main/java/org/s4s/gui/views/ArtikelShopView.java

src/main/java/org/s4s/gui/views/ArtikeldetailsView.java

src/main/java/org/s4s/gui/views/ArtikelerstellungsView.java

src/main/java/org/s4s/gui/views/ShopView.java

src/main/java/org/s4s/gui/views/SucheView.java

src/main/java/org/s4s/gui/views/TemplateView.java

...va/org/s4s/process/control/ArtikelerstellungsControl.java

src/main/java/org/s4s/process/control/ProductControl.java