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

.gitignore

.idea/artifacts/shopInShop_war_exploded.xml

.idea/workspace.xml

pom.xml

shopInShop.iml

src/main/java/org/s4s/View/InitView.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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