Consolidated Branches

Consolidated client and server Branches