stuff
Merge branch 'master' of https://github.com/sgupta31/Client-App

Conflicts:
	bin/UI/ChatPanel$1.class
	bin/backend/TelecomClient.class