Client + TestGUI - wait for testing
Merge remote-tracking branch 'origin/Client'