Merge branch 'master' into CSS-Wonderland-Max

.gitignore

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

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

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

...in/java/org/s4s/gui/views/RegistrierungsBestaetigung.java

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

...in/java/org/s4s/gui/views/ShoperstellungsBestätigung.java

src/main/java/org/s4s/services/util/Views.java