Small changes to WorkerInfo, Client

WorkerInfo set and get state methods synchronized, client simplified.
Fixed MasterServer merge conflict