server UPDATED
Merge branch 'gettingFriendList' into develop

Conflicts:
	SSUM/ChatDlg.cpp
	SSUM/ChatDlg.h
	SSUM/SSUM.rc
	SSUM/resource.h
conflict resolved (in ChatDlg)