Some merge fixins.
Some merge fixins.

MinFu/uproxy,dhkong88/uproxy,uProxy/uproxy,dhkong88/uproxy,qida/uproxy,jpevarnek/uproxy,jpevarnek/uproxy,roceys/uproxy,chinarustin/uproxy,MinFu/uproxy,itplanes/uproxy,IveWong/uproxy,itplanes/uproxy,roceys/uproxy,chinarustin/uproxy,dhkong88/uproxy,IveWong/uproxy,qida/uproxy,qida/uproxy,MinFu/uproxy,itplanes/uproxy,qida/uproxy,MinFu/uproxy,itplanes/uproxy,jpevarnek/uproxy,jpevarnek/uproxy,qida/uproxy,uProxy/uproxy,uProxy/uproxy,MinFu/uproxy,itplanes/uproxy,uProxy/uproxy,chinarustin/uproxy,dhkong88/uproxy,dhkong88/uproxy,roceys/uproxy,roceys/uproxy,uProxy/uproxy,jpevarnek/uproxy,IveWong/uproxy,chinarustin/uproxy,IveWong/uproxy,roceys/uproxy,chinarustin/uproxy