Fixed bad merge
Fixed bad merge

Tri125/MCServer,nounoursheureux/MCServer,mc-server/MCServer,tonibm19/cuberite,kevinr/cuberite,zackp30/cuberite,bendl/cuberite,Altenius/cuberite,marvinkopf/cuberite,bendl/cuberite,ionux/MCServer,tonibm19/cuberite,Altenius/cuberite,mc-server/MCServer,tonibm19/cuberite,QUSpilPrgm/cuberite,nevercast/cuberite,linnemannr/MCServer,QUSpilPrgm/cuberite,linnemannr/MCServer,mjssw/cuberite,SamOatesPlugins/cuberite,HelenaKitty/EbooMC,nevercast/cuberite,nounoursheureux/MCServer,Frownigami1/cuberite,SamOatesPlugins/cuberite,Frownigami1/cuberite,mmdk95/cuberite,guijun/MCServer,kevinr/cuberite,linnemannr/MCServer,mc-server/MCServer,birkett/MCServer,Altenius/cuberite,kevinr/cuberite,thetaeo/cuberite,Schwertspize/cuberite,Haxi52/cuberite,nicodinh/cuberite,Frownigami1/cuberite,electromatter/cuberite,Schwertspize/cuberite,SamOatesPlugins/cuberite,guijun/MCServer,johnsoch/cuberite,HelenaKitty/EbooMC,tonibm19/cuberite,birkett/MCServer,thetaeo/cuberite,marvinkopf/cuberite,thetaeo/cuberite,Howaner/MCServer,nichwall/cuberite,nichwall/cuberite,Fighter19/cuberite,electromatter/cuberite,ionux/MCServer,Howaner/MCServer,Howaner/MCServer,thetaeo/cuberite,mc-server/MCServer,Haxi52/cuberite,Howaner/MCServer,nicodinh/cuberite,nichwall/cuberite,nichwall/cuberite,zackp30/cuberite,QUSpilPrgm/cuberite,birkett/MCServer,HelenaKitty/EbooMC,jammet/MCServer,birkett/cuberite,guijun/MCServer,zackp30/cuberite,Haxi52/cuberite,Schwertspize/cuberite,Tri125/MCServer,jammet/MCServer,kevinr/cuberite,zackp30/cuberite,marvinkopf/cuberite,johnsoch/cuberite,jammet/MCServer,mmdk95/cuberite,bendl/cuberite,johnsoch/cuberite,birkett/cuberite,mjssw/cuberite,bendl/cuberite,mmdk95/cuberite,linnemannr/MCServer,HelenaKitty/EbooMC,marvinkopf/cuberite,mc-server/MCServer,Howaner/MCServer,johnsoch/cuberite,electromatter/cuberite,nichwall/cuberite,nevercast/cuberite,mmdk95/cuberite,nounoursheureux/MCServer,kevinr/cuberite,Haxi52/cuberite,linnemannr/MCServer,nicodinh/cuberite,birkett/MCServer,mmdk95/cuberite,bendl/cuberite,nounoursheureux/MCServer,nicodinh/cuberite,jammet/MCServer,guijun/MCServer,Frownigami1/cuberite,birkett/MCServer,marvinkopf/cuberite,nicodinh/cuberite,Fighter19/cuberite,nevercast/cuberite,Tri125/MCServer,jammet/MCServer,ionux/MCServer,electromatter/cuberite,HelenaKitty/EbooMC,zackp30/cuberite,Fighter19/cuberite,QUSpilPrgm/cuberite,guijun/MCServer,johnsoch/cuberite,QUSpilPrgm/cuberite,guijun/MCServer,Altenius/cuberite,nounoursheureux/MCServer,nichwall/cuberite,birkett/cuberite,tonibm19/cuberite,mc-server/MCServer,ionux/MCServer,Tri125/MCServer,thetaeo/cuberite,birkett/MCServer,Fighter19/cuberite,birkett/cuberite,nevercast/cuberite,electromatter/cuberite,Tri125/MCServer,QUSpilPrgm/cuberite,linnemannr/MCServer,nicodinh/cuberite,Schwertspize/cuberite,mjssw/cuberite,mjssw/cuberite,Fighter19/cuberite,Schwertspize/cuberite,zackp30/cuberite,tonibm19/cuberite,Haxi52/cuberite,mjssw/cuberite,marvinkopf/cuberite,SamOatesPlugins/cuberite,ionux/MCServer,nevercast/cuberite,Altenius/cuberite,mmdk95/cuberite,jammet/MCServer,Howaner/MCServer,Fighter19/cuberite,thetaeo/cuberite,birkett/cuberite,SamOatesPlugins/cuberite,electromatter/cuberite,Tri125/MCServer,ionux/MCServer,Haxi52/cuberite,mjssw/cuberite,kevinr/cuberite,nounoursheureux/MCServer,birkett/cuberite,Frownigami1/cuberite