Deleted everything for a fresh merge with ClientMergeBranch
Everything is merged to Network-Client-Dev

Please work