edit Client
Merge branch 'meilenstein5' of https://github.com/royfochtman/WBA2_Phase2 into meilenstein5