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

Conflicts:
	G9Messenger/clientsocket.cpp
Merge branch 'master' of https://github.com/Frumba/G9Messenger
sdada