Client: Branch out to develop client
Merge remote-tracking branch 'origin/master' into Client
Integrating Working Client