improved chat features
Merge branch 'master' of github.com:chrisochs/game_machine

Conflicts:
	server/mono/server/proxy.log