Chat Log
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ChangeLog
	Sources/Client/Client.cpp