Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/.gitignore
	bin/chat/chatWindow$1.class
	bin/chat/chatWindow.class
	src/chat/chatWindow.java