Fix merge error
Fix merge error

xiaoyanit/cgeo,lewurm/cgeo,auricgoldfinger/cgeo,madankb/cgeo,ThibaultR/cgeo,cgeo/cgeo,madankb/cgeo,rsudev/c-geo-opensource,SammysHP/cgeo,schwabe/cgeo,pstorch/cgeo,Huertix/cgeo,ThibaultR/cgeo,matej116/cgeo,samueltardieu/cgeo,rsudev/c-geo-opensource,S-Bartfast/cgeo,kumy/cgeo,samueltardieu/cgeo,superspindel/cgeo,lewurm/cgeo,brok85/cgeo,tobiasge/cgeo,lewurm/cgeo,KublaikhanGeek/cgeo,cgeo/cgeo,brok85/cgeo,vishwakulkarni/cgeo,yummy222/cgeo,xiaoyanit/cgeo,S-Bartfast/cgeo,mucek4/cgeo,yummy222/cgeo,auricgoldfinger/cgeo,Huertix/cgeo,tobiasge/cgeo,pstorch/cgeo,marco-dev/c-geo-opensource,SammysHP/cgeo,Huertix/cgeo,tobiasge/cgeo,Bananeweizen/cgeo,S-Bartfast/cgeo,mucek4/cgeo,KublaikhanGeek/cgeo,auricgoldfinger/cgeo,kumy/cgeo,marco-dev/c-geo-opensource,rsudev/c-geo-opensource,schwabe/cgeo,vishwakulkarni/cgeo,mucek4/cgeo,schwabe/cgeo,superspindel/cgeo,pstorch/cgeo,yummy222/cgeo,samueltardieu/cgeo,KublaikhanGeek/cgeo,kumy/cgeo,xiaoyanit/cgeo,marco-dev/c-geo-opensource,Bananeweizen/cgeo,matej116/cgeo,ThibaultR/cgeo,cgeo/cgeo,brok85/cgeo,schwabe/cgeo,superspindel/cgeo,madankb/cgeo,Bananeweizen/cgeo,cgeo/cgeo,matej116/cgeo,SammysHP/cgeo,vishwakulkarni/cgeo