merge Develop

added 2serverCluster. test and review and merge.