Removing socket server from cmake for now and maintaining it in its own branch until push to master
Merge remote-tracking branch 'upstream/master'