changed peerendpoint at server dao to peerdto
fixed merge conflicts