merge by hand with kimberly
Merge branch 'master' of https://github.com/zzzace2000/T12_aabbcc

Conflicts:
	cClient/bin/conn/cClient.class