premerge
Merge branch 'master' of https://github.com/AffectProspect/DistributedCode
merge and modifications to ensure repo clone executes-- Commented out references to client id in custom_..._server near line 405; prefixed with 'shawn'