Added client improvements
Merge branch 'master' of https://github.com/assisstion/Communicator

Conflicts:
	src/com/github/assisstion/Communicator/Main.java