ban moi
Merge branch 'DucHa' of https://github.com/duchaptit/chatyahoo into DucHa

Conflicts:
	ChatYahoo/bin/controlClient/ClientUser.class
	ChatYahoo/bin/controlClient/MainViewControl$1.class
	ChatYahoo/bin/controlClient/MainViewControl.class
	ChatYahoo/bin/controlServer/ClientConnect.class
	ChatYahoo/bin/model/Setting.class
	ChatYahoo/src/controlClient/MainViewControl.java
	ChatYahoo/src/controlServer/ClientConnect.java