edit format and broadCast
merge
Merge branch 'master' of https://github.com/panida/ChatTest

Conflicts:
	build/classes/Server$ClientThread.class
Merge branch 'master' of https://github.com/panida/ChatTest

Conflicts:
	build/classes/Server$ClientThread.class