Merge branch 'master' of https://github.com/Frumba/QiQi

Conflicts:
	msn/actions.cpp
	msn/actions.h
	msn/chatwindow.cpp
	msn/chatwindow.h
	msn/clientsocket.cpp
	msn/clientsocket.h
	msn/messenger.cpp
	msn/msn.pro
Merge branch 'master' of https://github.com/Frumba/QiQi

Conflicts:
	msn/actions.h
	msn/clientsocket.cpp