Implemented a better Discovery.
Switched Clients from the Scheduler into own threads since they can deadlock the Scheduler
Merge remote-tracking branch 'origin/master'