commit from lixiu
Merge branch 'LixiuMaster' of https://github.com/lixiu11/dodoChater.git

Conflicts:
	addfriend.cpp
	chatpanel.cpp
	dodologin.cpp
	globaldefs.h
	main.cpp
	mainclient.cpp
	mainclient.h
	mainpanel.cpp
	mainpanel.h
	mainpanel.ui
Merge branch 'master' of https://github.com/lixiu11/dodoChater.git

Conflicts:
	addfriend.cpp
	chatpanel.cpp
	dodologin.cpp
	globaldefs.h
	main.cpp
	mainclient.cpp
	mainclient.h
	mainpanel.cpp
	mainpanel.h
	mainpanel.ui