8 Server instead of 4, and they are the same (Duplicated Servers)

I updated from 1.5.3 to 1.6.0 and was confused that there were suddenly 8 Servers instead of 4. Then i saw that the Servers were duplicated for no reason.

I made a Screenshot, to show how that looked

 

(I also had a Bug that i wasn't able to change my Skin except from Steve to Alex)