Master slave client#161

superfashi wants to merge 3 commits intomastermujin/controllerclientcpp:masterfrom

masterslavemujin/controllerclientcpp:masterslaveCopy head branch name to clipboard