Bug fix... this should eliminate the crash in the gateway
Merge remote-tracking branch 'origin/master'

Conflicts:
	NetworkCommon/NetworkIn/Khaan.cpp
Merge branch 'master' of https://github.com/mkawick/ChatResearch

This reverts commit ad77b85a2d8e88f2b6fd71815ec161ba99e13f3f.

Conflicts:
	NetworkCommon/NetworkIn/Khaan.cpp