Finish video and audio
Merge branch 'master' of https://github.com/zzzace2000/T12_aabbcc

Conflicts:
	cClient/bin/GUI/conDialog$1.class
	cClient/bin/GUI/conDialog$2.class
	cClient/bin/GUI/conDialog.class
	cClient/bin/GUI/mainFram$1.class
	cClient/bin/GUI/mainFram$2.class
	cClient/bin/GUI/mainFram$addtab.class
	cClient/bin/GUI/mainFram$addtabButton.class
	cClient/bin/GUI/mainFram$checktypeListener.class
	cClient/bin/GUI/mainFram$tablabel.class
	cClient/bin/GUI/mainFram.class
	cServer/bin/conn/cServer.class