Added remote UDP client for desktop PC
Resolving merge conflicts