Merge pull request #9 from kminhc/FelixChristianBranch

Update Client.java
Merge pull request #10 from kminhc/master

TobiasBranch merge from master
FastFertigGUIALJDPASJD
Merge pull request #12 from kminhc/TobiasBranch

Tobias branch
Merge pull request #14 from kminhc/master

Christian-Felix merge from master