Merge Sync rework branch

[luar123]

For me it is working, but someone should test with mdns. I needed to resolve some conflicts and can't test here. @anabolyc Could you please give this a quick try, just to make sure I didn't mess up your UI improvements?

There is a lot of new commented code in main.c, should I remove that?